]> git.wh0rd.org Git - tt-rss.git/commitdiff
projects / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5eaaa0 18433c6)
Merge branch 'master' of git.fakecake.org:tt-rss
authorAndrew Dolgov <noreply@fakecake.org>
Mon, 17 Aug 2015 04:55:44 +0000 (07:55 +0300)
committerAndrew Dolgov <noreply@fakecake.org>
Mon, 17 Aug 2015 04:55:44 +0000 (07:55 +0300)
1  2 
include/functions2.php patch | diff1 | diff2 | blob | history

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