Merge branch 'MDL-58492-master-famarkers' of git://github.com/mudrd8mz/moodle
commit538dbf37e1beebbd02b53fabbfb24847cb18cebd
authorDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 09:10:04 +0000 (10 11:10 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 10 Apr 2017 09:10:04 +0000 (10 11:10 +0200)
treebe7b2d229016c6a3d3feb2833d3d8b5c3a6ca410
parent60b6e1bf0b0b2f67324feeceef16e13bf37da06a
parentf7cfa26ec4dd5d1986e3e47fdd25ed19722b8293
Merge branch 'MDL-58492-master-famarkers' of git://github.com/mudrd8mz/moodle
lib/classes/output/icon_system_fontawesome.php