Merge branch '4.5' of github.com:vichan-devel/Tinyboard into HEAD

Conflicts:
	templates/themes/basic/index.html
This commit is contained in:
czaks 2014-06-20 23:27:34 +02:00
commit 73177fcffc
318 changed files with 3218 additions and 832 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Before After
Before After