Merge branch 'MDL-62904-34' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE
commitf2d07ac911d39c80df776fffce9bf58db735bebb
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 25 Oct 2018 22:04:01 +0000 (26 00:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 25 Oct 2018 22:04:01 +0000 (26 00:04 +0200)
tree64213cb1be1e4d67f97dca1a571d719f89b4b213
parent01189bf5a442c3a2ffb033e9a36ed8e708fabe6f
parent8464779f2aa76dfa2b22297753b9441e35fa9010
Merge branch 'MDL-62904-34' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE
admin/tool/dataprivacy/lang/en/tool_dataprivacy.php