Merge branch 'MDL-60427_dnd_folder_improved' of git://github.com/davosmith/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 8 Jan 2018 16:42:30 +0000 (17:42 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 8 Jan 2018 16:42:30 +0000 (17:42 +0100)
1  2 
lang/en/moodle.php

Simple merge