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

Browse Source

Conflicts:
	templates/themes/basic/index.html

...

This commit is contained in:

czaks committed 2014-06-20 23:27:34 +02:00

2 parents 9e2b722db6 7933abd271

commit 73177fcffc

318 files changed

+3218 -832

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

templates/themes/basic/thumb.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.1 KiB After Width:  |  Height:  |  Size: 7.7 KiB