Merge branch 'MDL-62251-master' of git://github.com/rezaies/moodle

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

Sun, 13 May 2018 18:10:44 +0000 (20:10 +0200)

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

Sun, 13 May 2018 18:10:44 +0000 (20:10 +0200)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 May 2018 18:10:44 +0000 (20:10 +0200)
committer Eloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 May 2018 18:10:44 +0000 (20:10 +0200)
diff --cc privacy/classes/local/request/moodle_content_writer.php
Simple merge
diff --cc privacy/classes/tests/request/content_writer.php
Simple merge
diff --cc privacy/tests/moodle_content_writer_test.php
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Sun, 13 May 2018 18:10:44 +0000 (20:10 +0200)
committer	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Sun, 13 May 2018 18:10:44 +0000 (20:10 +0200)
		1	2
privacy/classes/local/request/moodle_content_writer.php	patch \|	diff1 \|	diff2 \|	blob \| history
privacy/classes/tests/request/content_writer.php	patch \|	diff1 \|	diff2 \|	blob \| history
privacy/tests/moodle_content_writer_test.php	patch \|	diff1 \|	diff2 \|	blob \| history