]> git.wh0rd.org Git - tt-rss.git/commitdiff
projects / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32b7a34 c050148)
Merge branch 'master' of https://github.com/gothfox/Tiny-Tiny-RSS.git into tunable...
authorBarak Korren <barak.korren@gmail.com>
Mon, 1 Apr 2013 15:39:57 +0000 (18:39 +0300)
committerBarak Korren <barak.korren@gmail.com>
Mon, 1 Apr 2013 15:39:57 +0000 (18:39 +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/