Merge branch 'MDL-58357-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 10 Apr 2017 05:26:21 +0000 (13:26 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 10 Apr 2017 05:26:21 +0000 (13:26 +0800)
commit9be24e45b7d06fec1c55dd7782cdc2611aa580a6
treef097964d0c4dcd228a887aedc78b5c57cb917620
parent3afd529013d5860faaedde8ce777174814fa3748
parent4413b466266590c1e75034c8ec2a40a643f15828
Merge branch 'MDL-58357-master' of git://github.com/damyon/moodle
lib/classes/output/icon_system_fontawesome.php