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)
1  2 
backup/moodle2/restore_stepslib.php
badges/classes/privacy/provider.php
lib/badgeslib.php

Simple merge
Simple merge
Simple merge