Merge branch 'MDL-63842-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Nov 2018 15:03:16 +0000 (16:03 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Nov 2018 15:03:16 +0000 (16:03 +0100)
commit79c4c80f2b49d4c7f09c2e46bd2e2b4a3f58b05b
tree98688df2a1e0f0a97d3200a05296c8addfd3f343
parentf2d83f50e155d7127e00cff49dbb682c96bded72
parent3dd49ad738cf30fecce5cbd8bc947bd0ca3df40a
Merge branch 'MDL-63842-master' of git://github.com/andrewnicols/moodle