Merge branch 'MDL-60427_dnd_folder_improved' of git://github.com/davosmith/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 10 Jan 2018 11:16:38 +0000 (12:16 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 10 Jan 2018 11:16:38 +0000 (12:16 +0100)

Trivial merge