Merge branch 'MDL-57900_master' of git://github.com/dmonllao/moodle
commitdfb1a3b00e8ddb28c30121f545fc226275899eb6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Apr 2019 18:41:36 +0000 (29 20:41 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Apr 2019 18:47:01 +0000 (30 20:47 +0200)
tree46ee1dbc2bc0ee58f46da870ef42ab5fc97dd1af
parent79c0e536838d6130a372b683942604d1d7a7be17
parenta89077e49f4fe01a3650e5d55a4af09401e3380e
Merge branch 'MDL-57900_master' of git://github.com/dmonllao/moodle