Merge branch 'MDL-63714-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Oct 2018 22:10:45 +0000 (00:10 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 24 Oct 2018 22:10:45 +0000 (00:10 +0200)
commit19dbce00a128394c2b00008d373b78864c862d98
tree2124e9bdf9879130ee1b1d0b0b0491b4522d579f
parentfcc50ccbc3cf9e9929b44bdbe5e87c1be3561c97
parenteb514bb3e57683c3230856c9b4c08f0a5298ea0d
Merge branch 'MDL-63714-master' of git://github.com/andrewnicols/moodle