Merge branch 'MDL-60249-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Nov 2017 23:48:41 +0000 (00:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Nov 2017 23:48:41 +0000 (00:48 +0100)
commit2b6fa076278fcd6ccecce55fb1e16ff4d6dbcf67
treec4b6a1e2a77b7a7947f5bbb9bf08f40e5c62c3c4
parentd3fa95abf163dac3565ae9fa6feb133198226fcc
parente76e6bc8bd75dca8154e6874a33e027b24501b1b
Merge branch 'MDL-60249-master' of git://github.com/damyon/moodle