Merge branch 'MDL-61637_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2018 16:09:02 +0000 (18:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 May 2018 16:09:02 +0000 (18:09 +0200)
commit614ebf05ea1ff4e5e57d019ac397ae3a7e9c94e1
treec97a78203d8a337d2b907c8e28db8870b2379329
parent28e06c2a17524943100258c426bf8ab9ad84599b
parent868fc2aba12264f1a2195d17b8a80a162efdca93
Merge branch 'MDL-61637_master' of git://github.com/dmonllao/moodle