Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 56e6113 737df5c)

commit	8f599567657c57ecdbc0d8f17b611e995eca3801
author	Andrew Nicols <andrew@nicols.co.uk>
	Wed, 1 Apr 2015 10:48:10 +0000 (1 18:48 +0800)
committer	Andrew Nicols <andrew@nicols.co.uk>
	Wed, 1 Apr 2015 10:48:10 +0000 (1 18:48 +0800)
tree	cfe64abc17d1f5e9aeed8cbd84a19f5a96ea0e8f	tree \| snapshot (tar.gz zip)
parent	56e611331eeb4a79452ab80486028dfd2d47c4cd	commit \| diff
parent	737df5ca1b7e00202c2cb100bcb5237898d68eaa	commit \| diff

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

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

Read-only mirror of the Moodle CVS