Merge branch 'MDL-63028-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Aug 2018 10:48:41 +0000 (12:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 23 Aug 2018 10:48:41 +0000 (12:48 +0200)
commita20ff7089cc755501b8b80d9a66b568f5aea38dd
tree8069491009af7d59b13603d35774c7b4686dc868
parent2c6771d7933dd0e442acab1cb5430e7b35418c22
parent4a5ceb215fdf045a5cca6e10aa69e738d4871578
Merge branch 'MDL-63028-master' of git://github.com/bmbrands/moodle