Merge branch 'wip-MDL-61522-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:45:37 +0000 (00:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 22:45:37 +0000 (00:45 +0200)
commit5deadc8229809f5ae6eb7cf7e8c3266f9a724b9c
tree43b2b1f85f66c2dbfd51358d6032d7e10dca1a26
parent3f278e7803c841ccec891b48452cdb34fc2aae5c
parentca6f717578330ee7d654ea1fb02993bbd4d2356b
Merge branch 'wip-MDL-61522-master' of git://github.com/marinaglancy/moodle