1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-09-25 12:08:23 +02:00

Merge master branch into staging

Conflicts:
	templates/themes/ukko/theme.php
This commit is contained in:
czaks 2014-04-30 18:28:46 +02:00
commit 4e21e3dbb7

View File

@ -96,7 +96,6 @@
'body' => $body,
'mod' => $mod,
'boardlist' => createBoardlist($mod),
'return' => ($mod ? '?' . $board['url'] . $config['file_index'] : $config['root'] . $board['dir'] . $config['file_index'])
));
}