Merge branch 'MDL-60578-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 4 Sep 2018 13:18:02 +0000 (21:18 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 4 Sep 2018 13:18:02 +0000 (21:18 +0800)
commitd58fd3dcbbdccc953f4fa2bb3b6bc0157b6ca00f
treeabaad3f4d8392e93133df55bef1b34f33e903c71
parentacfdb84f3c5a652ac76aae87afada6199a2f05d7
parentf39d43af418d0e757adb5c88330d310204727a16
Merge branch 'MDL-60578-master' of git://github.com/jleyva/moodle