czaks 8ca495e5b8 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5 ...

Conflicts:
	inc/config.php

2013-09-17 19:12:19 -04:00

..

auth.php

Cleaner check to make sure inc/ files aren't accessed directly.

2013-09-06 20:12:04 +10:00

ban.php

Begin upgrade to much better bans table. DO NOT PULL YET; It won't work.

2013-09-17 09:15:24 +10:00

config-editor.php

Begin upgrade to much better bans table. DO NOT PULL YET; It won't work.

2013-09-17 09:15:24 +10:00

pages.php

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard into vichan-devel-4.5

2013-09-17 19:12:19 -04:00