diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-01-26 11:35:33 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-01-26 11:35:33 +0100 |
| commit | 2ee10302a5a0aa250099733ca1208d94e86cb406 (patch) | |
| tree | 99101801967d5473fc9d3e66f0e7da44ab2c5501 /lib/exe/js.php | |
| parent | ba56222349781fd8e3938ab18127d46f3c1e0061 (diff) | |
| parent | 930913b3152f64b46cbc08adc1f899bf37bb3d3a (diff) | |
| download | dokuwiki-2ee10302a5a0aa250099733ca1208d94e86cb406.tar.gz dokuwiki-2ee10302a5a0aa250099733ca1208d94e86cb406.zip | |
Merge branch 'master' of git://github.com/gronke/dokuwiki into pull-request-158
* 'master' of git://github.com/gronke/dokuwiki:
update.js applied
update.sh must overwrite stylesheet
jQuery update.sh
jQuery latest
Diffstat (limited to 'lib/exe/js.php')
| -rw-r--r-- | lib/exe/js.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index 42979eeed..7c1c27138 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -43,6 +43,7 @@ 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/jquery/jquery.mb.browser.js", DOKU_INC."lib/scripts/fileuploader.js", DOKU_INC."lib/scripts/fileuploaderextended.js", DOKU_INC.'lib/scripts/helpers.js', |