]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47fecba 1016a4e)
Merge branch 'master' of http://github.com/gothfox/Tiny-Tiny-RSS
authorjustauser <justausr@hotmail.com>
Sun, 7 Jul 2013 17:54:10 +0000 (13:54 -0400)
committerjustauser <justausr@hotmail.com>
Sun, 7 Jul 2013 17:54:10 +0000 (13:54 -0400)
updating from github]

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/