Merge branch 'MDL-62310-master' of git://github.com/cescobedo/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 3 May 2018 09:59:48 +0000 (17:59 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 3 May 2018 10:00:40 +0000 (18:00 +0800)
commit9ab7a315d1bfafcd2fcb71afc5112775bc7f43c5
tree581aed5b85ebc63d2282539697ef5064abe2d58d
parentc166b700d8033136d6f34a20159f73bb17838c3f
parent7ee1f3dede36920afc18cc7f7c5b0413af3df107
Merge branch 'MDL-62310-master' of git://github.com/cescobedo/moodle
admin/classes/privacy/provider.php