Merge branch 'MDL-62228_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 15 May 2018 11:31:07 +0000 (13:31 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 15 May 2018 11:31:07 +0000 (13:31 +0200)
commit85218c28e96b7a18f588db82966f36c4c52b3280
treec9046bee19ded7797faf34af740c41dcbbeb9112
parentdc71a8b50e27c621d50e8d3681f92a155d2c74de
parentdf1714f25a161a9914324e4768a71d647c97407c
Merge branch 'MDL-62228_master' of git://github.com/markn86/moodle
calendar/classes/privacy/provider.php
cohort/classes/privacy/provider.php
mod/glossary/classes/privacy/provider.php