Merge branch 'MDL-55937-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Aug 2017 21:17:24 +0000 (23:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Aug 2017 21:17:24 +0000 (23:17 +0200)
commiteb2e291716651e8c07a9b5c024d11f3a2175faa3
treeb37efb2393cf030505d3e4efa56e7b212300972e
parent6b1e790231260ccd0b6c9df48f0f3b45b1e139d2
parent2ba3ce98291b8044d035aa15ba2fe0eeca991f69
Merge branch 'MDL-55937-master' of git://github.com/ankitagarwal/moodle