Merge branch 'MDL-61549-master' of git://github.com/Dagefoerde/moodle
commit56a71777416b98a6a77b7b0d6f784e44d180a900
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Mar 2018 22:22:47 +0000 (5 23:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Mar 2018 22:22:47 +0000 (5 23:22 +0100)
tree9880b62b66232307e6039f67c6f5948c1b04e117
parent03d174d7339c36175851e7fd17614bfa45a5765d
parentaa949cb2f92d72ac94ab6ad1568927f7d2b8d3b7
Merge branch 'MDL-61549-master' of git://github.com/Dagefoerde/moodle