Merge branch 'MDL-62535-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Aug 2018 23:19:57 +0000 (01:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Aug 2018 23:19:57 +0000 (01:19 +0200)
commitcf76059eda1235ddefe5545be9c6b5fcbb275a35
treec4903d3cdbab3183416f02000be6bcc2458785e3
parent12ef47cd994b607181453c28719df6c6cc502230
parent4905daf49729949d1d831e5475e7476df7bebc93
Merge branch 'MDL-62535-master' of git://github.com/abgreeve/moodle
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php