Merge branch 'MDL-62016_master' of git://github.com/dmonllao/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 14 May 2018 03:05:45 +0000 (11:05 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 14 May 2018 03:05:45 +0000 (11:05 +0800)
1  2 
admin/tool/dataprivacy/classes/output/data_registry_page.php
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php