Merge branch 'MDL-64140-master' of https://github.com/snake/moodle
commit65c6723681deccfc952a784fa9128d1b20b36af1
authorDavid Monllao <davidm@moodle.com>
Mon, 26 Nov 2018 12:27:24 +0000 (26 13:27 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 26 Nov 2018 12:27:24 +0000 (26 13:27 +0100)
tree8a1127f073f7c2db728fdb6a65555c57be4dfdc5
parent9f61908ccdf0beb8a21435b2ee5a8c9dd3476192
parent36fabf72c044ae58d72a23d998b09009ed01c685
Merge branch 'MDL-64140-master' of https://github.com/snake/moodle