Merge branch 'MDL-61177-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Thu, 11 Jan 2018 01:22:24 +0000 (09:22 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 11 Jan 2018 01:22:24 +0000 (09:22 +0800)
commit9b49ac26d59ebc26ce6b881038439d453469299f
tree66be667bc2d97c8d19118fa300d7babb19bf667c
parent197672e26c73a3fd3ef74a9d51aec256e4ab09df
parent57e226b96f869f0d21b45956ef539eaed324a1f7
Merge branch 'MDL-61177-master' of git://github.com/andrewnicols/moodle