Merge branch 'wip-MDL-59287-master-v3' of git://github.com/abgreeve/moodle

author Dan Poltawski <dan@moodle.com>

Tue, 11 Jul 2017 10:29:53 +0000 (11:29 +0100)

committer Dan Poltawski <dan@moodle.com>

Tue, 11 Jul 2017 10:29:53 +0000 (11:29 +0100)
author Dan Poltawski <dan@moodle.com>
Tue, 11 Jul 2017 10:29:53 +0000 (11:29 +0100)
committer Dan Poltawski <dan@moodle.com>
Tue, 11 Jul 2017 10:29:53 +0000 (11:29 +0100)
diff --cc course/lib.php
Simple merge
diff --cc mod/workshop/lib.php
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 11 Jul 2017 10:29:53 +0000 (11:29 +0100)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 11 Jul 2017 10:29:53 +0000 (11:29 +0100)
		1	2
course/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/workshop/lib.php	patch \|	diff1 \|	diff2 \|	blob \| history