]> git.wh0rd.org Git - tt-rss.git/commit
Merge branch 'master' of git.fakecake.org:tt-rss
authorAndrew Dolgov <noreply@madoka.volgo-balt.ru>
Mon, 13 Jul 2015 09:46:05 +0000 (12:46 +0300)
committerAndrew Dolgov <noreply@madoka.volgo-balt.ru>
Mon, 13 Jul 2015 09:46:05 +0000 (12:46 +0300)
commit4f9a3c0e0f995b5ad8eed5357df3d12beb8bee00
tree43b8e2eb0757095b80ed877ae1c379b7f0463f2e
parentc939dfc39645f6fd687dd926c50286eda4b2c2df
parent402073d6a1845f5874da67aa055e733cd2ae693a
Merge branch 'master' of git.fakecake.org:tt-rss

Conflicts:
classes/pref/filters.php
classes/pref/filters.php