Merge branch 'MDL-27230-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 27 Nov 2017 01:43:44 +0000 (09:43 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 27 Nov 2017 01:43:44 +0000 (09:43 +0800)
commit29abde470987fa4e8c05e1093950aaca8227ed72
tree33b918c46800c2a1760c74940e99f88a4e21be0d
parent84ae267c56f17d706fdfc850b232c5a43f8a3262
parent99618f89bfa9b2694c837b7073e96864e9cea5c0
Merge branch 'MDL-27230-master' of https://github.com/lucaboesch/moodle