Merge branch 'MDL-63009-master' of git://github.com/mickhawkins/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 21:30:13 +0000 (23:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 21:30:13 +0000 (23:30 +0200)
1  2 
admin/tool/dataprivacy/classes/api.php
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php