Merge branch 'MDL-64011-master' of git://github.com/abgreeve/moodle
authorDamyon Wiese <damyon@moodle.com>
Thu, 15 Nov 2018 08:10:21 +0000 (16:10 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 15 Nov 2018 08:10:21 +0000 (16:10 +0800)
commit47dc7eb8a46c759c439d72f478c882e8a71f4b1d
treebe1a4f74d12ac5856a45e08e3fafb2da01c0612e
parent91194bfd9fdb1c0ded0adebde3922de8e6fc7860
parent750f1588fa99adec7de47bd036bed77abd3b850c
Merge branch 'MDL-64011-master' of git://github.com/abgreeve/moodle
badges/renderer.php