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)
commitc7a2ed73b7cd4a85acf63e57eff1152b016b0637
tree948977b407a8bb2249e23da795b1d18d6402be53
parent882d2787ba1533cf26acb1f0d55b9690b9f5ddf9
parent4023f84b29640d32b50dd304f890d43a50837274
Merge branch 'MDL-62016_master' of git://github.com/dmonllao/moodle
admin/tool/dataprivacy/classes/output/data_registry_page.php
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php