Merge branch 'MDL-63238-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 3 Sep 2018 08:36:16 +0000 (10:36 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 3 Sep 2018 08:36:16 +0000 (10:36 +0200)
commitf3b4a63f91e7e8dc5773afab43a622665a7204fc
treef41ffe534655b6f3fe0b0b1d3dd6a2044fda9f06
parentc69a43f2fcb5e8e64f430ce58f2e2a3740acdb5b
parent8e1a1c26be598df65f571a51d64e370704c878ac
Merge branch 'MDL-63238-master' of git://github.com/bmbrands/moodle