]> git.wh0rd.org Git - tt-rss.git/commitdiff
projects / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f44977 046ec65)
Merge branch 'master' into tunable-fetches
authorBarak Korren <barak.korren@gmail.com>
Mon, 1 Apr 2013 15:40:46 +0000 (18:40 +0300)
committerBarak Korren <barak.korren@gmail.com>
Mon, 1 Apr 2013 15:40:46 +0000 (18:40 +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/