Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 7c5dbf0 9029ce7)

commit	b485fb20ddb65ee9de5e956f9af65ba3d39b729d
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Thu, 2 Apr 2015 09:05:32 +0000 (2 11:05 +0200)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Thu, 2 Apr 2015 09:05:32 +0000 (2 11:05 +0200)
tree	b643fa02c7c36cc75a50078fd6eab32048f658ca	tree \| snapshot (tar.gz zip)
parent	7c5dbf039636b811ab54439917e1378b80d8969d	commit \| diff
parent	9029ce75ebe2fca13a657c2531477d1f0e970642	commit \| diff

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

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

lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js	diff1 \|	diff2 \|	blob \| history
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js	diff1 \|	diff2 \|	blob \| history
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js	diff1 \|	diff2 \|	blob \| history

Read-only mirror of the Moodle CVS