Merge branch 'MDL-64702-master' of git://github.com/damyon/moodle
authorSara Arjona <sara@moodle.com>
Mon, 29 Apr 2019 06:34:21 +0000 (08:34 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 29 Apr 2019 06:34:21 +0000 (08:34 +0200)
commitbef68056564289d995db393308627ffb54a94339
tree798dde3f3d921bfb80c90986ed19c48d87b761b6
parent5d57265abf3d8aab4ff0c555a89fefe984b8a631
parentb3337bd5a45eb59389e71a99aa2dd4c4a8755411
Merge branch 'MDL-64702-master' of git://github.com/damyon/moodle
backup/moodle2/restore_stepslib.php
badges/classes/privacy/provider.php
lib/badgeslib.php