Merge branch 'MDL-62365-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 14 May 2018 08:39:41 +0000 (10:39 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 14 May 2018 08:39:41 +0000 (10:39 +0200)
commit3558897fc3f46ef448171c80c3ba1b4f320abb01
tree249ef8e2dd34f3c6c61b67e9a28f882e6e4cdc0b
parent62b94b486e30675d6952ee2cb9a69ee5ecd14478
parent04b1bea112eeb0ff8886150db2e91a6eb752cd8a
Merge branch 'MDL-62365-master' of git://github.com/bmbrands/moodle
lib/classes/output/icon_system_fontawesome.php