Eloy Lafuente (stronk7) 82cf09885c Merge branch 'MDL-49686-master' of git://github.com/merrill-oakland/moodle ...

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

2015-04-02 11:08:11 +02:00

..

atto

Merge branch 'MDL-49686-master' of git://github.com/merrill-oakland/moodle

2015-04-02 11:08:11 +02:00

textarea

MDL-48021 bump: Bump all versions to planned release

2014-11-04 17:52:35 +01:00

tinymce

Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle

2015-04-02 11:06:27 +02:00

index.html

…