]> git.wh0rd.org Git - tt-rss.git/commitdiff
projects / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fde50b4 5f19596)
Merge branch 'master' of simonpl/tt-rss into master
authorfox <fox+git@fakecake.org>
Thu, 14 Dec 2017 18:01:21 +0000 (18:01 +0000)
committerGogs <gogs@fake.local>
Thu, 14 Dec 2017 18:01:21 +0000 (18:01 +0000)

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