Merge branch 'MDL-63279_master' of https://github.com/aanabit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 21:56:37 +0000 (23:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Sep 2018 21:56:37 +0000 (23:56 +0200)
commit044e343bbd05a4926027279e5eb1cea5e20ee56b
tree0a21280ab87aaad18a15e5f3dfa615cfe2316be2
parentd20250ab3ec7521763a611d6848afc486721daac
parentfdb45f7943643a0ebc93b5b50df57468cc833597
Merge branch 'MDL-63279_master' of https://github.com/aanabit/moodle