Merge branch 'MDL-61781-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 21:46:08 +0000 (23:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Apr 2018 21:46:08 +0000 (23:46 +0200)
commiteed3d30194acf718de80942f417d60db4c1ac899
tree7cb95f600e2475b874c52c4138dab3083fc34422
parent5b123ab8d38450eeae3501fadc144fba767b0293
parent8274c72ca18060977ab2e045bec36b391a41c986
Merge branch 'MDL-61781-master' of https://github.com/lucaboesch/moodle