Merge branch 'MDL-55528-master' of git://github.com/andrewnicols/moodle

2017-03-14 12:07:33 +00:00
parent f7c7799cbf 357712eabe
commit 732bd13171
52 changed files with 4813 additions and 886 deletions
@@ -1755,6 +1755,10 @@ class core_plugin_manager {
                'imagegallery'
            ),

+            'fileconverter' => array(
+                'unoconv'
+            ),
+
            'editor' => array(
                'atto', 'textarea', 'tinymce'
            ),