Merge branch 'MDL-61223-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 09:53:10 +0000 (11:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 09:53:10 +0000 (11:53 +0200)
commit7d4c1953d90bc7cbab401aba340ebc6fef8981d9
tree98e80e55792d3460a2abb6d8f8e1e58235936c32
parent64a14f15bc22844d9ec6ae30156b06e93ba2cd41
parent68c2b72673a970d2571c7c177739e194a1fb4081
Merge branch 'MDL-61223-master' of git://github.com/andrewnicols/moodle