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

Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
	inc/image.php
	js/expand.js
	js/hide-threads.js
	js/local-time.js
	js/smartphone-spoiler.js
	templates/header.html
	templates/index.html
	templates/main.js
	templates/page.html
	templates/post_reply.html
	templates/post_thread.html
	templates/thread.html

2013-07-31 14:54:20 -04:00

2.5 KiB

Raw Blame History

View Raw