Merge branch 'MDL-53240-master-filetypewidgets' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 21:38:23 +0000 (23:38 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 21:38:23 +0000 (23:38 +0200)
commit39f0cb8b8f26944c07f378beb887dcef1cdaa8aa
tree098616a9454fdb792efd0bcb43fe7a8aa6b28ece
parentf3f4c142fc2b25d19df022fbd97a091bdf000726
parent710a2414d8c8f614b39c47df3d6634c46c6f3f40
Merge branch 'MDL-53240-master-filetypewidgets' of git://github.com/mudrd8mz/moodle