Merge branch 'm33_MDL-60318_Undefined_method_file_storage-move_to_trash' of https...
commitd83185cfae03d0c0a6680fbb81ecc4cf61cfed7f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Oct 2017 21:12:08 +0000 (9 23:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Oct 2017 21:12:08 +0000 (9 23:12 +0200)
treef085766447ee1c55935212aed80896a7284785da
parent67a41913807fc9df5c18410f77307f780a361753
parentaccc87283a38fda1d0316431e1145d3e90803fbc
Merge branch 'm33_MDL-60318_Undefined_method_file_storage-move_to_trash' of https://github.com/scara/moodle into MOODLE_33_STABLE