]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 77accf4 b74c513)
Merge remote-tracking branch 'upstream/master'
authorRichard Beales <rich@richbeales.net>
Thu, 21 Mar 2013 07:04:54 +0000 (07:04 +0000)
committerRichard Beales <rich@richbeales.net>
Thu, 21 Mar 2013 07:04:54 +0000 (07:04 +0000)
1  2 
index.php patch | diff1 | diff2 | blob | history

diff --cc index.php
Simple merge
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/