]> git.wh0rd.org Git - tt-rss.git/commitdiff
projects / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ceb893 ee15687)
Merge branch 'master' of git.fakecake.org:tt-rss
authorAndrew Dolgov <noreply@fakecake.org>
Mon, 3 Aug 2015 16:21:12 +0000 (19:21 +0300)
committerAndrew Dolgov <noreply@fakecake.org>
Mon, 3 Aug 2015 16:21:12 +0000 (19:21 +0300)
1  2 
plugins/instances/init.php patch | diff1 | diff2 | blob | history

diff --cc plugins/instances/init.php
Simple merge
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/