Merge branch 'MDL-58356-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Apr 2017 04:10:45 +0000 (12:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 13 Apr 2017 04:10:45 +0000 (12:10 +0800)
commit20026ab3c163bc596c2f79f05c5784b54f55aec7
tree8441072b415e19129334687fe75e53e2abf62a2a
parent270d5c1cc5e738360dc992917a33fb7523c4d8b0
parent1a10c79f67d98dbaacdf2a3991b8bab246ea2eb7
Merge branch 'MDL-58356-master' of git://github.com/damyon/moodle
lib/classes/output/icon_system_fontawesome.php