Merge branch 'MDL-62384-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE
commit6204ed292e2d66ef574f5716ad4393789eaa7eef
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2018 16:27:58 +0000 (11 18:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2018 16:27:58 +0000 (11 18:27 +0200)
tree55e0b4e4202dee6a30342ca926725fbc56f63370
parent3c4be4e9f5a3dbe52943987234fc6fcbbce5ac54
parent9b5778fcd195d0bb5682eebf613f36d91413a360
Merge branch 'MDL-62384-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE
competency/classes/privacy/provider.php
mod/assign/classes/privacy/provider.php