Merge branch 'MDL-63401-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE
commit957c839884542a4f20d624e6029c07efec633ae7
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 09:36:44 +0000 (9 11:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 09:36:44 +0000 (9 11:36 +0200)
tree17e240769ce883976863427eb866f2b4d392bff0
parentcde9c8ccc05e26b370feb45808c401592406ab8a
parente5088f07a85b9f55a095f28b1c2f840aa5c4f905
Merge branch 'MDL-63401-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php