Merge branch 'MDL-45837_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 13 Feb 2018 06:48:16 +0000 (07:48 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 13 Feb 2018 06:48:16 +0000 (07:48 +0100)
commit4b140685ad3c08810bf4778c4cde5a12937dfcd2
tree7b1b774f5b8ff7657375ce03c6fa68db9c14366e
parent5ac4e277fade14a3173e58b53c3c2c054c9efce3
parente96015214146c602069cfce203a1aa9da6f6f2ae
Merge branch 'MDL-45837_master' of git://github.com/markn86/moodle