Merge branch 'm34_MDL-60318_Undefined_method_file_storage-move_to_trash' of https...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Oct 2017 21:11:08 +0000 (23:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Oct 2017 21:11:08 +0000 (23:11 +0200)

Trivial merge