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
..
lib	Deprecate postControls(), per-file deletion and spoilering	2014-04-30 17:18:35 -04:00
locale	fug, i replaced finnish locale with pt_BR?	2014-05-04 02:13:37 +02:00
mod	Deprecate postControls(), per-file deletion and spoilering	2014-04-30 17:18:35 -04:00
anti-bot.php
api.php	multiimage posting	2014-04-27 15:48:47 +02:00
bans.php
cache.php
config.php	Merge branch 'master' of github.com:vichan-devel/Tinyboard into staging	2014-05-04 00:19:45 +02:00
database.php
display.php	Deprecate postControls(), per-file deletion and spoilering	2014-04-30 17:18:35 -04:00
events.php
filters.php
functions.php	Merge branch 'master' of github.com:vichan-devel/Tinyboard into staging	2014-05-04 00:19:45 +02:00
image.php
instance-config.php
remote.php
template.php