summaryrefslogtreecommitdiff
path: root/src/static
diff options
context:
space:
mode:
authorEgil Moeller <egil.moller@freecode.no>2012-02-26 22:02:02 +0100
committerEgil Moeller <egil.moller@freecode.no>2012-02-26 22:02:02 +0100
commit0a4a7f538d16ee63d195300d21b5378ec3bcab32 (patch)
tree7babbbd10fc39b9933ff7ce001428f235143df86 /src/static
parent763361a7c938ca00a73e1ebc00dc08b8ce39ebaf (diff)
parent2c7b84ca3ef6eac2a0773bedf47f4d69564e7236 (diff)
downloadetherpad-lite-0a4a7f538d16ee63d195300d21b5378ec3bcab32.zip
Merge branch 'temo'
Diffstat (limited to 'src/static')
-rw-r--r--src/static/pad.html1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/static/pad.html b/src/static/pad.html
index 5019391d..0160c60b 100644
--- a/src/static/pad.html
+++ b/src/static/pad.html
@@ -297,6 +297,7 @@
var clientVars = {};
(function () {
require.setRootURI("../minified/");
+ require.setLibraryURI("../minified/plugins/");
require.setGlobalKeyPath("require");
require('ep_etherpad-lite/static/js/pad').init();