]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a83b58f e236d87)
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
authorAndrew Dolgov <fox@fakecake.org>
Fri, 28 Dec 2012 05:39:35 +0000 (09:39 +0400)
committerAndrew Dolgov <fox@fakecake.org>
Fri, 28 Dec 2012 05:39:35 +0000 (09:39 +0400)
1  2 
include/functions.php patch | diff1 | diff2 | blob | history

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