]> git.wh0rd.org - tt-rss.git/commitdiff
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

diff --cc functions.php
Simple merge