Andrew Dolgov 4f9a3c0e0f Merge branch 'master' of git.fakecake.org:tt-rss ... Conflicts: classes/pref/filters.php		2015-07-13 12:46:05 +03:00
..
feeds.php	edit feed: smaller buttons for icon upload; allow uploading larger favicons	2014-10-08 16:38:03 +04:00
filters.php	Merge branch 'master' of git.fakecake.org:tt-rss	2015-07-13 12:46:05 +03:00
labels.php	make pluginhost a singleton	2013-04-18 12:27:34 +04:00
prefs.php	add a bit more visible separate infobox for password change results	2015-07-06 12:10:15 +03:00
system.php	add clear sql log button	2013-04-29 23:12:54 +04:00
users.php	disable OTP on user password reset	2014-03-09 10:33:41 +04:00