Merge branch 'MDL-61252-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jan 2018 01:13:10 +0000 (02:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 23 Jan 2018 01:13:10 +0000 (02:13 +0100)
commitb878578d90e0750fdc92b326ccd16d2a5759a174
tree0fcea74ab9747ffb174072dd3cc583bcfc0a5ec3
parentdd2e263752583c28ca9dfe959e07fcd47edd47dc
parentcaa9cb71249fa1a13a39144cc9f4ba6d0215ab44
Merge branch 'MDL-61252-master' of git://github.com/andrewnicols/moodle