Merge branch 'MDL-62370-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 14 May 2018 14:00:32 +0000 (16:00 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 May 2018 14:00:32 +0000 (16:00 +0200)
commit014335fb2b2baded398d4421cff554362c5734f4
tree2675c3f5cf97a28f674ae5ab27f5aec462b764ca
parent0668ba779a5fc065abb8155188c4e68ab35d9175
parent502344a90483a35719d443750579520ee41573bc
Merge branch 'MDL-62370-master' of git://github.com/andrewnicols/moodle
admin/tool/dataprivacy/classes/metadata_registry.php
lang/en/privacy.php
privacy/classes/manager.php