diff options
author | Anika Henke <anika@selfthinker.org> | 2014-02-02 14:43:06 +0000 |
---|---|---|
committer | Anika Henke <anika@selfthinker.org> | 2014-02-02 14:43:06 +0000 |
commit | a051c2744a397f5ccbb688e0edab307451dc522d (patch) | |
tree | d9744944e50f2c23df22bd6856779bd228e129c4 /conf | |
parent | 3641199a253e8f92f378f03926af80724ef04146 (diff) | |
parent | a8895ef5de970d5e6b1e273c3fe111b606611244 (diff) | |
download | rpg-a051c2744a397f5ccbb688e0edab307451dc522d.tar.gz rpg-a051c2744a397f5ccbb688e0edab307451dc522d.tar.bz2 |
Merge remote-tracking branch 'origin/master' into video-audio
Diffstat (limited to 'conf')
-rw-r--r-- | conf/plugins.required.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/conf/plugins.required.php b/conf/plugins.required.php index 26eb8888b..75336da2e 100644 --- a/conf/plugins.required.php +++ b/conf/plugins.required.php @@ -4,8 +4,9 @@ * from changes by the extention manager. These settings will override any local settings. * It is not recommended to change this file, as it is overwritten on DokuWiki upgrades. */ -$plugins['acl'] = 1; -$plugins['plugin'] = 1; -$plugins['config'] = 1; -$plugins['usermanager'] = 1; -$plugins['revert'] = 1; +$plugins['acl'] = 1; +$plugins['authplain'] = 1; +$plugins['extension'] = 1; +$plugins['config'] = 1; +$plugins['usermanager'] = 1; +$plugins['template:dokuwiki'] = 1; // not a plugin, but this should not be uninstalled either |