]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7871db1 aea6554)
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Sun, 11 Dec 2011 15:37:42 +0000 (19:37 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Sun, 11 Dec 2011 15:37:42 +0000 (19:37 +0400)
1  2 
functions.php patch | diff1 | diff2 | blob | history

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