Merge branch 'MDL-64629-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2019 18:00:31 +0000 (19:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Jan 2019 18:00:31 +0000 (19:00 +0100)
commitf12f3840ddf43e29674ef7b2a5de1d7ce48ad4b0
treec2fe059f0a1c631db0ae221a3009e68f2699d74d
parent59776faf6fd23870dd4404e2f50497b462091e31
parent527ba1a848b4851a80b49b87cf12fbad774c4785
Merge branch 'MDL-64629-master' of git://github.com/sarjona/moodle