]> git.wh0rd.org Git - tt-rss.git/commitdiff
projects / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2d5d14 73f5f11)
fix conflict when sanitize_rss was called incorrectly in CDM
authorAndrew Dolgov <fox@madoka.spb.ru>
Fri, 1 Aug 2008 03:48:56 +0000 (04:48 +0100)
committerAndrew Dolgov <fox@madoka.spb.ru>
Fri, 1 Aug 2008 03:48:56 +0000 (04:48 +0100)
1  2 
functions.php patch | diff1 | diff2 | blob | history

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