1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-28 01:10:51 +01:00

Merge branch 'master' of github.com:vichan-devel/Tinyboard

Conflicts:
	templates/post/image_identification.html
This commit is contained in:
czaks 2015-03-23 00:35:48 +01:00
commit 11c020be9b