Merge branch 'temo'

This commit is contained in:
Egil Moeller 2012-02-26 22:02:02 +01:00
commit 0a4a7f538d
4 changed files with 41 additions and 24 deletions

View file

@ -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();