Merge branch 'MDL-63701-master-1' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Nov 2018 04:02:58 +0000 (12:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 2 Nov 2018 04:02:58 +0000 (12:02 +0800)
commitd1d7d1396a9ca187f332d628437f024688dd2e5f
tree3216faa96a81c8ab4cbff4ad10f275af2d73d56f
parent91071ad785264876136930d224262cfe34a8f821
parent0a1c6cbacf6d661e76338bd461568133b6548517
Merge branch 'MDL-63701-master-1' of git://github.com/mihailges/moodle
lib/editor/atto/classes/privacy/provider.php