czaks 24b1adc501 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard ... Conflicts: inc/config.php inc/display.php inc/mod/pages.php js/catalog-link.js post.php templates/banned.html		2013-08-11 09:50:33 -04:00
..
auth.php	Add optional database table prefix (issue #118; see issue comments for details)	2013-07-31 22:14:26 -04:00
ban.php	fix previous commit; markup is called via reference	2013-08-01 01:09:54 -04:00
config-editor.php	?/config: Advanced permissions	2013-08-04 17:53:09 -04:00
pages.php	Merge branch 'master' of https://github.com/savetheinternet/Tinyboard	2013-08-11 09:50:33 -04:00