Merge branch 'w28_MDL-40450_m26_tinymcebuttons' of https://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 9 Jul 2013 23:02:21 +0000 (11:02 +1200)
committerSam Hemelryk <sam@moodle.com>
Tue, 9 Jul 2013 23:02:21 +0000 (11:02 +1200)
commit1be1f6be53d9e877b92a97dd52dd64519f0da728
treeac66eeafd23ea7de0e39e5c044226154692a9f2d
parentccae3a612d2c2b2ac396e8e7ef9b293698c4e7b8
parent83f45bfd567778194e1657fb11d0e4052e1bf7d0
Merge branch 'w28_MDL-40450_m26_tinymcebuttons' of https://github.com/skodak/moodle
lib/editor/tinymce/settings.php