Merge branch 'MDL-32350-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 5 Dec 2017 22:31:16 +0000 (11:31 +1300)
committerJun Pataleta <jun@moodle.com>
Wed, 6 Dec 2017 06:53:35 +0000 (19:53 +1300)
commitb908c1add216b9330b241cc82276d8f84c80389a
treef2042dce760de53d199b48133dd33eda9d1357ae
parent1396cb63467b0ab3a6780f20ae7f115ab862bfdb
parentfc07f6adbc59786af1f107a8ffba2ea67fe4fd6f
Merge branch 'MDL-32350-master' of https://github.com/lucaboesch/moodle