Merge branch 'MDL-61875-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 11:03:27 +0000 (13:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 11:03:27 +0000 (13:03 +0200)
commit7aeb85770f5c73cbdc34eb36acaeb15e58016461
treec2cc13185833e51794ddf5e1ed9dd8c71fd39ab3
parentd25a8e3c69cb704b8fc1df3961815167cfdb40e9
parent6e6ba8230515a16aebe60e488f0bf94b59eb113f
Merge branch 'MDL-61875-master' of https://github.com/snake/moodle