]> git.wh0rd.org Git - tt-rss.git/commit
Merge remote-tracking branch 'origin' into hookhead
authorjustauser <justausr@hotmail.com>
Thu, 27 Jun 2013 15:57:49 +0000 (11:57 -0400)
committerjustauser <justausr@hotmail.com>
Thu, 27 Jun 2013 15:57:49 +0000 (11:57 -0400)
commit7171f32dc5ace4f36e1e70605ae96ebdbdf25c4f
treee998d4fca34cebe801c982d1d7bf8932adbf218a
parent891e36f57e2e3955a4f13019e8fdc58fce826434
parentfac096405338e0f46fa248320318436d862678fc
Merge remote-tracking branch 'origin' into hookhead

Conflicts:
classes/feeds.php

fix for merging up to the origin
classes/feeds.php
classes/pref/filters.php