Merge branch 'MDL-65191-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2019 22:46:47 +0000 (00:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Apr 2019 22:46:47 +0000 (00:46 +0200)
commitdabc69afe5beabd63e332af6c61f84aa1dba1614
tree0d88c3b2768754cfee97ff76dfd5157cf26191d0
parent21bf5ae5aba954e4e39c8874ce263e6ff91fe4a6
parent15263647fa3a009185da75111b0d3ffe87ae14d4
Merge branch 'MDL-65191-master' of git://github.com/lameze/moodle
lang/en/admin.php
lib/badgeslib.php
lib/db/tasks.php
version.php