Merge branch 'MDL-61891-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 23 Apr 2018 09:55:15 +0000 (11:55 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 23 Apr 2018 09:55:15 +0000 (11:55 +0200)
commita07d13dcbf7502722d871078f45d39e02714b613
tree01e3535f33cbc442b3a2cf9bb8a0b906e65dcea1
parentce447198b8c9d57ccb046a80815b66199e6970d1
parent0cbe51a856d9873cf822f4f6a841af4ee8230625
Merge branch 'MDL-61891-master' of git://github.com/andrewnicols/moodle