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

Conflicts:
	inc/config.php
	inc/functions.php
	templates/generic_page.html
	templates/index.html

2013-08-03 19:05:25 -04:00

2.5 KiB

Raw Blame History

View Raw