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)
1  2 
lib/setuplib.php

Simple merge