Public Git Hosting - moodle.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 0b9cf14 42e3e29)

commit	684e59ea5fea29ae2534ef8aff3c9542b656c45e
author	David Monllao <davidm@moodle.com>
	Thu, 3 Sep 2015 03:14:24 +0000 (3 11:14 +0800)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Thu, 3 Sep 2015 08:38:36 +0000 (3 10:38 +0200)
tree	d9ff4e0dcd7399fe2b00463e2ecfc8e9ac7889b6	tree \| snapshot (tar.gz zip)
parent	0b9cf149806a4659b92c4c9f83e22c74f2c93ccd	commit \| diff
parent	42e3e29791993514cffd6b493d9a85ccc400dc3b	commit \| diff

Merge branch 'MDL-51179-28' of git://github.com/damyon/moodle into MOODLE_28_STABLE

Conflicts:
lib/upgrade.txt

lib/upgrade.txt	diff1 \|	diff2 \|	blob \| history
question/behaviour/rendererbase.php	diff1 \|	diff2 \|	blob \| history

Read-only mirror of the Moodle CVS