]> git.wh0rd.org Git - tt-rss.git/commitdiff
projects / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf42b79 4ca621a)
Merge branch 'master' into patch-1
authorArt4 <art4@wlabs.de>
Thu, 19 Feb 2015 22:17:43 +0000 (23:17 +0100)
committerArt4 <art4@wlabs.de>
Thu, 19 Feb 2015 22:17:43 +0000 (23:17 +0100)
Conflicts:
locale/de_DE/LC_MESSAGES/messages.po


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