Merge branch 'MDL-59756-master-2' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Aug 2017 11:38:01 +0000 (13:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 Aug 2017 11:38:01 +0000 (13:38 +0200)
commit19e8e56e7eea0ed7e9d6188eb3d0b3cd84aa07fb
tree5dc2c5964747d99105023bc46351cb8b58186fbf
parent245227fdcd0107f11e653fd47d1a690cff5145e4
parent654f52d288cae525cc0cf868d27c5076f40479ca
Merge branch 'MDL-59756-master-2' of git://github.com/junpataleta/moodle