diff options
author | Andreas Gohr <andi@splitbrain.org> | 2010-03-12 14:11:50 +0100 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2010-03-12 14:11:50 +0100 |
commit | d7879495eef6e6a998f5d727304e88dfa5420108 (patch) | |
tree | 720cee6a7b738e5fec32492b4f6c1cf69312583d /inc/toolbar.php | |
parent | 84645d8c01570c5ea4cda556e70beccdec25ee22 (diff) | |
parent | 05ed2c25ea0dc45eef2af0f9f4176c939af41100 (diff) | |
download | rpg-d7879495eef6e6a998f5d727304e88dfa5420108.tar.gz rpg-d7879495eef6e6a998f5d727304e88dfa5420108.tar.bz2 |
Merge branch 'requireall'
Conflicts:
inc/fulltext.php
Diffstat (limited to 'inc/toolbar.php')
-rw-r--r-- | inc/toolbar.php | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/inc/toolbar.php b/inc/toolbar.php index 21819d138..a07bfb93d 100644 --- a/inc/toolbar.php +++ b/inc/toolbar.php @@ -7,8 +7,6 @@ */ if(!defined('DOKU_INC')) die('meh.'); -require_once(DOKU_INC.'inc/JSON.php'); - /** * Prepares and prints an JavaScript array with all toolbar buttons |