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

2014-04-08 13:53:19 +08:00
parent 392cb4577a 49a510efbd
commit 052d51b15f
16 changed files with 38 additions and 217 deletions
@@ -936,7 +936,7 @@ class core_plugin_manager {
                'equation', 'fontcolor', 'html', 'image', 'indent', 'italic',
                'link', 'managefiles', 'media', 'noautolink', 'orderedlist',
                'rtl', 'strike', 'subscript', 'superscript', 'table', 'title',
-                'underline', 'undo', 'unlink', 'unorderedlist'
+                'underline', 'undo', 'unorderedlist'
            ),

            'assignment' => array(