Merge branch 'MDL-37190-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 30 Jan 2018 04:02:37 +0000 (12:02 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:17 +0000 (10:33 +0800)
commitcdef2e7d345084f03a7f92ffd782b7750fba484b
tree90be682f767b8200f546b7b0a80f47749f048b60
parent74c0b5fe91d8cd4b0357f8124d50377047980be9
parent916a72bb51716499a7febb831b1e4a2040def14a
Merge branch 'MDL-37190-master' of https://github.com/lucaboesch/moodle