Merge branch 'MDL-69718-display-size-MOODLE_310_STABLE' of https://github.com/brendan...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Sep 2020 14:39:26 +0000 (16:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Sep 2020 14:39:26 +0000 (16:39 +0200)
1  2 
lang/en/moodle.php

Simple merge