Merge branch 'MDL-48971-master' of https://github.com/lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Tue, 22 Jan 2019 11:02:24 +0000 (12:02 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 22 Jan 2019 11:02:24 +0000 (12:02 +0100)
1  2 
lang/en/moodle.php

Simple merge