Merge branch 'MDL-62384-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commit92928baabef5e5fff8c1325406dd69ab9bc0c751
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2018 16:28:11 +0000 (11 18:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2018 16:28:11 +0000 (11 18:28 +0200)
tree76f90c3100d308ac0e190f8483cdaef1cc2a1891
parent15603499564262fab577ea2ac7e7848265d3d01e
parent7db992398f66fb305b0d670b76ee9b0f219a738a
Merge branch 'MDL-62384-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
competency/classes/privacy/provider.php
mod/assign/classes/privacy/provider.php