Merge branch 'MDL-58317-master' of git://github.com/damyon/moodle

author Dan Poltawski <dan@moodle.com>

Tue, 21 Mar 2017 08:03:42 +0000 (08:03 +0000)

committer Dan Poltawski <dan@moodle.com>

Tue, 21 Mar 2017 08:03:42 +0000 (08:03 +0000)
author Dan Poltawski <dan@moodle.com>
Tue, 21 Mar 2017 08:03:42 +0000 (08:03 +0000)
committer Dan Poltawski <dan@moodle.com>
Tue, 21 Mar 2017 08:03:42 +0000 (08:03 +0000)
diff --cc lib/amd/build/templates.min.js

index 6a0a867,39c00c3..87d6ada

Binary files differ
diff --cc lib/amd/src/templates.js
Simple merge
author	Dan Poltawski <dan@moodle.com>
	Tue, 21 Mar 2017 08:03:42 +0000 (08:03 +0000)
committer	Dan Poltawski <dan@moodle.com>
	Tue, 21 Mar 2017 08:03:42 +0000 (08:03 +0000)
		1	2
lib/amd/build/templates.min.js	patch \|	diff1 \|	diff2 \|	blob \| history
lib/amd/src/templates.js	patch \|	diff1 \|	diff2 \|	blob \| history