Merge branch 'MDL-63401-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 09:35:29 +0000 (11:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 09:35:29 +0000 (11:35 +0200)
commitbf0072e6c32afe86769d42925aa53f9679936a2d
tree37ff0aae1cd5cc8e619737246e967d9c5bee2677
parentf79460dafa3c01150f792491d2fb462850ff1f0b
parent751b5e8b92475180a4280c1f7970da51d4746888
Merge branch 'MDL-63401-master' of git://github.com/andrewnicols/moodle
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php
lib/moodlelib.php