Merge branch 'MDL-60838-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 19:48:15 +0000 (20:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Nov 2017 19:48:15 +0000 (20:48 +0100)
commit8000e6af0193bea9b050f58367dab4ffb3b21e75
tree7829563ee3bae330ac10da441710da63cdc80ce4
parent8c9eecdea72ac81a3ea9b50596276b69d656dc33
parent411b5f3a025c0aaaaf1947c58869db8ba179a285
Merge branch 'MDL-60838-master' of https://github.com/sammarshallou/moodle