summaryrefslogtreecommitdiff
path: root/lib/exe/js.php
diff options
context:
space:
mode:
authorMatthias Schulte <post@lupo49.de>2011-09-11 13:11:30 +0200
committerMatthias Schulte <post@lupo49.de>2011-09-11 13:11:30 +0200
commit1614eb9180008daaf518e6271b82222219efc008 (patch)
treebd9b3138f288fbc6786f3b28c7f3d438bf79c36f /lib/exe/js.php
parente2b5ad84f88d0bd1fe510fa74673cc7557c6e630 (diff)
parent29d511bfa507384ae0872f75fb54acb44b1e915e (diff)
downloadrpg-1614eb9180008daaf518e6271b82222219efc008.tar.gz
rpg-1614eb9180008daaf518e6271b82222219efc008.tar.bz2
Merge branch 'master' of http://github.com/splitbrain/dokuwiki
Diffstat (limited to 'lib/exe/js.php')
-rw-r--r--lib/exe/js.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php
index e96d45ee6..33f8c695d 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -43,6 +43,8 @@ function js_out(){
DOKU_INC."lib/scripts/jquery/jquery$min.js",
DOKU_INC.'lib/scripts/jquery/jquery.cookie.js',
DOKU_INC."lib/scripts/jquery/jquery-ui$min.js",
+ DOKU_INC."lib/scripts/fileuploader.js",
+ DOKU_INC."lib/scripts/fileuploaderextended.js",
DOKU_INC.'lib/scripts/helpers.js',
DOKU_INC.'lib/scripts/delay.js',
DOKU_INC.'lib/scripts/cookie.js',