Merge branch 'MDL-61309-master' of git://github.com/andrewnicols/moodle
commitf60b216de0f43195f81694797fe932ed45a1c7fd
authorDavid Monllao <davidm@moodle.com>
Wed, 9 May 2018 09:07:35 +0000 (9 11:07 +0200)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:15:57 +0000 (10 09:15 +0800)
tree7bac16d3923551991dd6aaa1dfd99594c48f0501
parentd8609cb545333dd76c20ad70d7383a1f1a59a437
parent3e95e09b6706f078b70d4b09e17e6466819a77d5
Merge branch 'MDL-61309-master' of git://github.com/andrewnicols/moodle