]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 22933e5 bfe5ddf)
Merge branch 'master' into digest-experimental
authorAndrew Dolgov <fox@bah.org.ru>
Thu, 9 Sep 2010 18:08:55 +0000 (22:08 +0400)
committerAndrew Dolgov <fox@bah.org.ru>
Thu, 9 Sep 2010 18:08:55 +0000 (22:08 +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/