]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e470a27 cc33260)
Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git
authorBarak Korren <barak.korren@gmail.com>
Tue, 2 Apr 2013 17:38:07 +0000 (20:38 +0300)
committerBarak Korren <barak.korren@gmail.com>
Tue, 2 Apr 2013 17:38:07 +0000 (20:38 +0300)
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/