Merge branch 'MDL-65344_master' of git://github.com/markn86/moodle

author Eloy Lafuente (stronk7) <stronk7@moodle.org>

Wed, 5 Jun 2019 19:06:15 +0000 (21:06 +0200)

committer Eloy Lafuente (stronk7) <stronk7@moodle.org>

Wed, 5 Jun 2019 19:06:15 +0000 (21:06 +0200)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2019 19:06:15 +0000 (21:06 +0200)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Jun 2019 19:06:15 +0000 (21:06 +0200)
diff --cc message/classes/api.php
Simple merge
diff --cc message/tests/api_test.php
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Wed, 5 Jun 2019 19:06:15 +0000 (21:06 +0200)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Wed, 5 Jun 2019 19:06:15 +0000 (21:06 +0200)
		1	2
message/classes/api.php	patch \|	diff1 \|	diff2 \|	blob \| history
message/tests/api_test.php	patch \|	diff1 \|	diff2 \|	blob \| history