Merge branch 'MDL-61388-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 14:48:56 +0000 (16:48 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 22 Oct 2018 14:48:56 +0000 (16:48 +0200)
commit64a00dffbd94fe4d530ac8754ea7b0600ed9e557
tree3f6999e077b3ed00e259f46f075c1f11736ff748
parent7e5f0fa66a409f722e549f478c4ca953298651c3
parentede1e4a186a4a28dcf5e6e9b74f1b5d0acddf973
Merge branch 'MDL-61388-master' of git://github.com/damyon/moodle