czaks a139c44a80 Merge branch 'master' of https://github.com/savetheinternet/Tinyboard ...

Conflicts:
	templates/page.html

2013-06-21 16:41:39 -04:00

..

auth.php

…

ban.php

…

config-editor.php

…

pages.php

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

2013-06-21 16:41:39 -04:00