Merge branch 'MDL-41265-master' of git://github.com/mihailges/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 01:06:47 +0000 (03:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 01:06:47 +0000 (03:06 +0200)
commite872f933254d63385fb010dfc754486e31a68904
tree35cde37f0a9446ff89e232044068cfada94427b5
parentd77104e28ce565fed3b6736924538bea59358c7b
parentf721ac68d4f30ee96bad7381eec8844dfc450f30
Merge branch 'MDL-41265-master' of git://github.com/mihailges/moodle