Merge branch 'MDL-61423-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE
commit5c07c79657594344d2de6a4452b3ed16eb376dca
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 8 Mar 2018 07:30:36 +0000 (8 15:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 8 Mar 2018 07:30:36 +0000 (8 15:30 +0800)
treea255aea1041516780786c3f7c9468e299a54e83e
parenta8b5704fb43e22ec0113be4830839d9bd70a52bc
parent5cb155ad9d087b980aef918eb8c259ec10cc86f8
Merge branch 'MDL-61423-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE
lang/en/admin.php