Merge branch 'MDL-63333_master' of git://github.com/markn86/moodle
commit0e5144fe24b2f47d668c90a3f0c6c0d4748b01c1
authorDavid Monllao <davidm@moodle.com>
Tue, 18 Sep 2018 10:17:46 +0000 (18 12:17 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 18 Sep 2018 10:17:46 +0000 (18 12:17 +0200)
tree97686ed795dd5d22e1577f4808ca370921e7ec29
parent58e529e0c039390e4f7a4ac87be17cb99d1c843a
parentcbc3833d275e6c56a389a04c2cbbcb7871831a1e
Merge branch 'MDL-63333_master' of git://github.com/markn86/moodle
admin/settings/subsystems.php
lang/en/admin.php
lib/db/upgrade.php
version.php