Merge branch 'MDL-61652-master' of git://github.com/mihailges/moodle
commitc46919aa91abffce8715b8e5c811f158b2294f52
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 00:32:22 +0000 (25 08:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Jul 2018 00:32:22 +0000 (25 08:32 +0800)
tree4e53178ca52391ff2e75ec8d775be26669349fd8
parent193a3aa9d789b04052b0451e29d0c307a6a6cf6e
parent635c7b29a0780f8275f54df1844f19cd826e31e8
Merge branch 'MDL-61652-master' of git://github.com/mihailges/moodle
admin/tool/dataprivacy/tests/api_test.php