Merge branch 'MDL-62277-master' of git://github.com/bmbrands/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 May 2018 18:50:20 +0000 (20:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 May 2018 18:50:20 +0000 (20:50 +0200)
commita7a5d10319cc6273e215dff2906b0b544177bafa
treea62f3f210abfe07c63692a9ebd6a8ad15c99cbfa
parent00293f90a403ed0aee9e799f8acf77e97b324241
parentf01734122a136e91ffe2c829002a2f76c40bdcf4
Merge branch 'MDL-62277-master' of git://github.com/bmbrands/moodle