]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a0a3ca 715a823)
Merge remote-tracking branch 'upstream/master' into owncloud
authorThomas Renard <cybaer42@web.de>
Thu, 27 Dec 2012 18:18:21 +0000 (19:18 +0100)
committerThomas Renard <cybaer42@web.de>
Thu, 27 Dec 2012 18:18:21 +0000 (19:18 +0100)

Trivial merge
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/