Merge branch 'MDL-59897-master' of https://github.com/sammarshallou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Oct 2017 02:31:34 +0000 (10:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Oct 2017 02:31:34 +0000 (10:31 +0800)
commit6ba5f93ea6763de706aaa1b9c1c530b9accde019
treebde4ce05280bedb3a197d3a96b06f36d7eb7c918
parent9f2bb19a470dc796c73a589e49af0d3cc79a45d4
parent46f7b264a33344e83d50a66826eeee1221ca2c69
Merge branch 'MDL-59897-master' of https://github.com/sammarshallou/moodle