diff options
| author | Chad Weider <cweider@oofn.net> | 2012-03-10 15:08:09 -0800 |
|---|---|---|
| committer | Chad Weider <cweider@oofn.net> | 2012-03-10 15:08:09 -0800 |
| commit | ddda347f7a8291935dacd647ef5eb3c1e67c08cd (patch) | |
| tree | e7358883c7f9c96c5f76b5ba51fb23ff02792d2b /src/static/js/pad_modals.js | |
| parent | 7b497b15220da0c13c5d489423c99286baac302c (diff) | |
| parent | 86d6dde42f3ba5d922955f9e49ccbb8caef2e404 (diff) | |
| download | etherpad-lite-ddda347f7a8291935dacd647ef5eb3c1e67c08cd.zip | |
Merge branch 'require-paths' into plugin
Conflicts:
node/server.js
src/static/js/Changeset.js
src/static/js/ace.js
src/static/js/ace2_common.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/changesettracker.js
src/static/js/chat.js
src/static/js/collab_client.js
src/static/js/contentcollector.js
src/static/js/domline.js
src/static/js/linestylefilter.js
src/static/js/pad.js
src/static/js/pad_connectionstatus.js
src/static/js/pad_docbar.js
src/static/js/pad_editbar.js
src/static/js/pad_editor.js
src/static/js/pad_impexp.js
src/static/js/pad_modals.js
src/static/js/pad_savedrevs.js
src/static/js/pad_userlist.js
src/static/js/pad_utils.js
src/static/js/timeslider.js
src/static/js/undomodule.js
src/static/pad.html
src/static/timeslider.html
Diffstat (limited to 'src/static/js/pad_modals.js')
| -rw-r--r-- | src/static/js/pad_modals.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/static/js/pad_modals.js b/src/static/js/pad_modals.js index c19648a6..0dd281bb 100644 --- a/src/static/js/pad_modals.js +++ b/src/static/js/pad_modals.js @@ -20,8 +20,8 @@ * limitations under the License. */ -var padutils = require('ep_etherpad-lite/static/js/pad_utils').padutils; -var paddocbar = require('ep_etherpad-lite/static/js/pad_docbar').paddocbar; +var padutils = require('./pad_utils').padutils; +var paddocbar = require('./pad_docbar').paddocbar; var padmodals = (function() { |