Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 16008df 93e80c9)

commit	cd32489d7a8a765b3695a6c178be4e9827ec47cf
author	Andrew Nicols <andrew@nicols.co.uk>
	Wed, 1 Apr 2015 04:37:37 +0000 (1 12:37 +0800)
committer	Andrew Nicols <andrew@nicols.co.uk>
	Wed, 1 Apr 2015 04:37:37 +0000 (1 12:37 +0800)
tree	4a55bf40991f91d53def7de6099a1ae5974022c8	tree \| snapshot (tar.gz zip)
parent	16008dfd9214884b082b4e7e8d8f75f23daa3bc8	commit \| diff
parent	93e80c9b45144441158cad313fc199e7cd69287f	commit \| diff

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

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