Merge branch 'MDL-61244_master' of https://gitlab.com/marxjohnson/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 1 Jul 2018 23:42:00 +0000 (01:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 1 Jul 2018 23:42:00 +0000 (01:42 +0200)
1  2 
lang/en/admin.php
lib/moodlelib.php

Simple merge
Simple merge