Merge master branch into staging
Conflicts: templates/themes/ukko/theme.php
This commit is contained in:
commit
4e21e3dbb7
@ -96,7 +96,6 @@
|
|||||||
'body' => $body,
|
'body' => $body,
|
||||||
'mod' => $mod,
|
'mod' => $mod,
|
||||||
'boardlist' => createBoardlist($mod),
|
'boardlist' => createBoardlist($mod),
|
||||||
'return' => ($mod ? '?' . $board['url'] . $config['file_index'] : $config['root'] . $board['dir'] . $config['file_index'])
|
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user