Merge branch 'MDL-62414-master' of git://github.com/junpataleta/moodle
commit4557b4e0651f0e9fffb2b2244088ed590c8f050b
authorDavid Monllao <davidm@moodle.com>
Mon, 14 May 2018 09:44:13 +0000 (14 11:44 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 May 2018 09:44:13 +0000 (14 11:44 +0200)
tree3e85c4182616a5570b12591e7fa6529b636b70d4
parent05dcf3579631cf6320b4fb8a9a10bbd27370e835
parentf946d875642473ebf4c6fc738760808121080a1c
Merge branch 'MDL-62414-master' of git://github.com/junpataleta/moodle
admin/tool/dataprivacy/createdatarequest_form.php
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php