summaryrefslogtreecommitdiff
path: root/lib/exe/js.php
diff options
context:
space:
mode:
authorAdrian Lang <lang@cosmocode.de>2010-01-20 10:56:01 +0100
committerAdrian Lang <lang@cosmocode.de>2010-01-20 10:56:01 +0100
commit7d723f3d24511105ce37006f9439632c3d8f915e (patch)
tree605809aace3e368d953466f76425b41d56fa1b38 /lib/exe/js.php
parent1c64eaeaa3295062b0a4e9b20b772274cd86ca42 (diff)
parenteee44352b2c73d56818600770b87f891b88a545f (diff)
downloadrpg-7d723f3d24511105ce37006f9439632c3d8f915e.tar.gz
rpg-7d723f3d24511105ce37006f9439632c3d8f915e.tar.bz2
Merge branch 'subscription'
Diffstat (limited to 'lib/exe/js.php')
-rw-r--r--lib/exe/js.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 38fda1789..8648bf18f 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -53,6 +53,7 @@ function js_out(){
DOKU_INC.'lib/scripts/edit.js',
DOKU_INC.'lib/scripts/linkwiz.js',
DOKU_INC.'lib/scripts/media.js',
+ DOKU_INC.'lib/scripts/subscriptions.js',
DOKU_TPLINC.'script.js',
);