Merge branch 'wip-MDL-40167-m26' of git://github.com/samhemelryk/moodle

2013-07-16 13:25:54 +08:00
parent cb8c7b9d56 a783d21066
commit 6ec1f2f2eb
31 changed files with 7776 additions and 1422 deletions
@@ -274,7 +274,6 @@ $cache = '.var_export($cache, true).';
            'currencies'  => null,
            'dbtransfer'  => null,
            'debug'       => null,
-            'dock'        => null,
            'editor'      => $CFG->dirroot.'/lib/editor',
            'edufields'   => null,
            'enrol'       => $CFG->dirroot.'/enrol',