Merge branch 'master' into vue

templates/main.php

@@ -20,8 +20,13 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
+use OCP\Util;
+
 style('deck', 'style');
 script('deck', 'deck');
+
+\OC::$server->getEventDispatcher()->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts');
 ?>
 
-<input type="hidden" id="debug-mode" value="<?php p($_['debug'] ? 'true' : 'false'); ?>">
+<input type="hidden" id="debug-mode" value="<?php p($_['debug'] ? 'true' : 'false'); ?>">