Merge master branch into staging

Conflicts: templates/themes/ukko/theme.php
2014-04-30 18:28:46 +02:00 · 2014-04-30 18:28:46 +02:00 · 4e21e3dbb7
commit 4e21e3dbb7
parent 776bbeb73e 3545ba1b47
1 changed files with 0 additions and 1 deletions
--- a/templates/themes/ukko/theme.php
+++ b/templates/themes/ukko/theme.php
@ -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'])
 			));
 		}