Merge branch 'MDL-62610-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Oct 2018 16:00:08 +0000 (18:00 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 3 Oct 2018 16:00:08 +0000 (18:00 +0200)
commit95f82860d54278405d256e66e5c8902769bb131c
tree7e11b92edd6643bb2ff16ad8429c57f2a13ef58d
parent1ef89ad49cfc09e17e25dcfbad5a00218bc3eb41
parent484b179d062b337db7d4a07ab58b4501184b43a7
Merge branch 'MDL-62610-master' of git://github.com/lameze/moodle
lang/en/moodle.php