Merge branch 'MDL-63153_master' of https://github.com/aanabit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Oct 2018 23:11:36 +0000 (01:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Oct 2018 23:11:36 +0000 (01:11 +0200)
commit3d18697115683682e13a26fc1325546b41feffc7
tree4b008c368a9666bf4d11f4503823c5c041541052
parent19dbce00a128394c2b00008d373b78864c862d98
parentf765fb380aef3cfcd448675505d89c35e16cae4d
Merge branch 'MDL-63153_master' of https://github.com/aanabit/moodle
lang/en/admin.php
lib/adminlib.php