Merge branch 'MDL-58359-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Apr 2017 05:35:36 +0000 (13:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Apr 2017 05:35:36 +0000 (13:35 +0800)
commit17cc2842a774e53a8be589df6ace90c45a592c38
treed79083c3a4c92126cd3edd11f25fd064e7fb394e
parent9be24e45b7d06fec1c55dd7782cdc2611aa580a6
parentd84b7f7f5c77844f1270fca12234933bf0a93ba0
Merge branch 'MDL-58359-master' of git://github.com/damyon/moodle
lib/classes/output/icon_system_fontawesome.php