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)
commit4ab33be074a3101844b8755e0a3c25ab1e35328b
tree904b802f4c7e278ebfe46f96368eda48d5ccef1c
parent01d7b4b6dd30abeb725fdb47c065b4a46b26d5c3
parent0971131a7833daa870d070f888bd6a1b5206d5bb
Merge branch 'MDL-63009-master' of git://github.com/mickhawkins/moodle
admin/tool/dataprivacy/classes/api.php
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php