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)
1  2 
lib/badgeslib.php

Simple merge