Merge branch 'MDL-58318-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Jun 2017 22:30:07 +0000 (00:30 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:30:39 +0000 (12:30 +0100)
commitf30af085a9893c85675a47c92ab37e3aef8bd183
treefaac134308bf257a99150793b24231bbf6e53bb3
parentfd5772e69191112d738b470fc36639c95481b12b
parentd4d414694a77a373a06f141eaece29e675dd0c18
Merge branch 'MDL-58318-master' of git://github.com/damyon/moodle
lib/setuplib.php