| commit | 3d8b835aec37ab306188f030702a6a74a8ccb297 | |
| author | Dan Poltawski <dan@moodle.com> | |
| Tue, 31 Mar 2015 18:25:10 +0000 (31 19:25 +0100) | ||
| committer | Dan Poltawski <dan@moodle.com> | |
| Tue, 31 Mar 2015 18:25:10 +0000 (31 19:25 +0100) | ||
| tree | 9fc6ffd52f0d859420d1641dbea2f15ff0f0b4d1 | treesnapshot (tar.gz zip) |
| parent | f5c493f75e9ef3c1e31eefab167f3e0dc1753c05 | commitdiff |
| parent | 1b6ce030d35b85ce96ca68ebdbd92e1c208f331d | commitdiff |
Merge branch 'MDL-49564-master' of git://github.com/merrill-oakland/moodle
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js