Merge branch 'MDL-48846-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2018 21:39:07 +0000 (23:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2018 21:39:07 +0000 (23:39 +0200)
commit6b4a2b0ea133b46f37a815d01268b4691b1c0412
tree5cbfa9898b04d5ade79f38e24ce9c2b24df89df0
parent4941d2d97d02c33f1c6649d942a0279e950e67de
parent292df9f613f986c664669174bdd4fbd2feabce16
Merge branch 'MDL-48846-master' of git://github.com/sarjona/moodle