Merge branch 'MDL-59875_m35v1' of https://github.com/sbourget/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 5 Dec 2017 03:00:54 +0000 (11:00 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:31 +0000 (19:53 +1300)
commita569a33097fc25300092263cf7401d6385b3595f
tree097f71ac83fdf51480251bf847ce67e55f1b184f
parent1b98e553a7ad98623ed59f2d335b68a41c0f9468
parenta7370e0dd0ba224f850719111378f4690216ee3e
Merge branch 'MDL-59875_m35v1' of https://github.com/sbourget/moodle
lib/badgeslib.php