Merge branch 'MDL-62211-master' of git://github.com/junpataleta/moodle

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

Tue, 3 Jul 2018 15:29:38 +0000 (17:29 +0200)

committer David Monllao <davidm@moodle.com>

Tue, 3 Jul 2018 21:33:02 +0000 (23:33 +0200)
author Eloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 15:29:38 +0000 (17:29 +0200)
committer David Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 21:33:02 +0000 (23:33 +0200)
diff --cc admin/tool/dataprivacy/lang/en/tool_dataprivacy.php
Simple merge
author	Eloy Lafuente (stronk7) <stronk7@moodle.org>
	Tue, 3 Jul 2018 15:29:38 +0000 (17:29 +0200)
committer	David Monllao <davidm@moodle.com>
	Tue, 3 Jul 2018 21:33:02 +0000 (23:33 +0200)