Merge branch 'MDL-62388_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 02:03:44 +0000 (10:03 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 02:03:44 +0000 (10:03 +0800)
commit195f6fe37ef8521dbf7dde5ff4a834137990b5b4
treec21fba9e9ef513c5c510a3214f4eecfd22b6ae7d
parent239c6202e2cff0eafd86a1cb5ad951ee0a9a014f
parentc2a38d17a481175f9d635d408f40b019583b88d9
Merge branch 'MDL-62388_master' of git://github.com/dmonllao/moodle
admin/tool/dataprivacy/classes/api.php