czaks 146243c473 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard ... Conflicts: inc/config.php inc/display.php inc/functions.php		2013-08-16 10:07:24 -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: Link URLs in comments	2013-08-12 21:14:32 +10:00
pages.php	Merge branch 'master' of https://github.com/savetheinternet/Tinyboard	2013-08-16 10:07:24 -04:00