justauser 7171f32dc5 Merge remote-tracking branch 'origin' into hookhead ...

Conflicts:
	classes/feeds.php

fix for merging up to the origin

2013-06-27 11:57:49 -04:00

..

feeds.php

batch feed editor: remove title and feed url because batch editing those makes no sense whatsoever

2013-06-25 23:07:09 +04:00

filters.php

Merge remote-tracking branch 'origin' into hookhead

2013-06-27 11:57:49 -04:00

labels.php

make pluginhost a singleton

2013-04-18 12:27:34 +04:00

prefs.php

move stylesheets to css/, reference default tt-rss stylesheets from

2013-05-19 21:22:01 +04:00

system.php

add clear sql log button

2013-04-29 23:12:54 +04:00

users.php

minor user editor updates

2013-06-11 12:12:43 +04:00