summaryrefslogtreecommitdiffstats
path: root/public_html/data/js/application.js
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2016-11-01 17:27:20 +0100
committerFlorian Pritz <bluewind@xinu.at>2016-11-01 17:27:20 +0100
commitcb58719aa2db88fc810b1d5724ec9f6e7fdc984c (patch)
treeaf2055c6d513c4c3c3e3305e0539ed7f547581ab /public_html/data/js/application.js
parent9efd2db81ccf987a5455e0e4575c7d3f9072870f (diff)
parentc3d5786689bbc4a7f499f07cf1390afd800dc69a (diff)
Merge branch 'webui-multipaste' into dev
Diffstat (limited to 'public_html/data/js/application.js')
-rw-r--r--public_html/data/js/application.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/public_html/data/js/application.js b/public_html/data/js/application.js
index 674f68008..d212ce04c 100644
--- a/public_html/data/js/application.js
+++ b/public_html/data/js/application.js
@@ -7,6 +7,7 @@ define(
'lexer-input',
'tabwidth-input',
'thumbnail-view',
+ 'multipaste',
'uploader',
'tablesorter',
'jquery',
@@ -20,6 +21,7 @@ define(
LexerInput,
TabwidthInput,
ThumbnailView,
+ Multipaste,
Uploader,
TableSorter,
$
@@ -44,6 +46,7 @@ define(
TabwidthInput.initialize();
LexerInput.initialize();
ThumbnailView.initialize();
+ Multipaste.initialize();
Uploader.initialize();
TableSorter.initialize();
this.configureTooltips();