Eloy Lafuente (stronk7) e154e9d8cd Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle ...

Conflicts:
	lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js

2014-04-02 00:27:30 +02:00

..

lang/en

MDL-44000 Atto: Add option to constrain image size

2014-03-31 16:28:57 +08:00

yui

Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle

2014-04-02 00:27:30 +02:00

lib.php

Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle

2014-04-02 00:27:30 +02:00

styles.css

Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle

2014-04-02 00:27:30 +02:00

version.php

MDL-43842: Import atto back into core

2014-03-26 09:59:34 +08:00