]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d50f41 0b9751c)
Merge branch 'master' of bah.org.ru:public_html/testbox/tt-rss
authorAndrew Dolgov <fox@bah.org.ru>
Thu, 28 Jan 2010 15:49:54 +0000 (18:49 +0300)
committerAndrew Dolgov <fox@bah.org.ru>
Thu, 28 Jan 2010 15:49:54 +0000 (18:49 +0300)
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/