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

Conflicts:
	templates/themes/catalog/catalog.html
	templates/themes/catalog/theme.php

2014-05-05 17:29:34 +02:00

..

catalog.html

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

2014-05-05 17:29:34 +02:00

info.php

integrate favelog into catalog theme; needs more work, code cleanup etc.

2014-04-30 00:14:25 +02:00

theme.php

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

2014-05-05 17:29:34 +02:00

thumb.png

…