Merge branch 'MDL-66032-MOODLE_37_STABLE_awarded_badges_criteria' of https://github...
commitf417dab602bc1067f66bc92c3c2590785e378076
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2019 23:31:54 +0000 (17 01:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2019 23:31:54 +0000 (17 01:31 +0200)
tree07343cd38491b88d1109602de3aadf2a39e5a007
parent334e44fb2cd740769cf7277ebb123e736a6f3ea1
parent191bcca9e23fcefc6cc8300582b7f6159f7b89c7
Merge branch 'MDL-66032-MOODLE_37_STABLE_awarded_badges_criteria' of https://github.com/andrewmadden/moodle into MOODLE_37_STABLE