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/JSON.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/JSON.php')
| -rw-r--r-- | inc/JSON.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/inc/JSON.php b/inc/JSON.php index 7ec400092..332827f4c 100644 --- a/inc/JSON.php +++ b/inc/JSON.php @@ -59,7 +59,6 @@ // for DokuWiki if(!defined('DOKU_INC')) die('meh.'); -require_once(DOKU_INC.'inc/utf8.php'); /** * Marker constant for JSON::decode(), used to flag stack state |