czaks 9f323ae65f Merge branch 'master' of https://github.com/savetheinternet/Tinyboard ... Conflicts: templates/themes/sitemap/info.php		2013-07-20 17:28:34 -04:00
..
auth.php	Merge pull request #115 from Macil/miscfixes	2013-06-18 10:45:13 -07:00
ban.php	$config['require_ban_view']: Force users to view the "You are banned" page at least once before letting a ban disappear naturally.	2013-07-16 06:33:37 -04:00
config-editor.php
pages.php	Merge branch 'master' of https://github.com/savetheinternet/Tinyboard	2013-07-20 17:28:34 -04:00