From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 program/js/tiny_mce/plugins/media/moxieplayer.swf |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/program/js/tiny_mce/plugins/media/moxieplayer.swf b/program/js/tiny_mce/plugins/media/moxieplayer.swf
new file mode 100644
index 0000000..585d772
--- /dev/null
+++ b/program/js/tiny_mce/plugins/media/moxieplayer.swf
Binary files differ

--
Gitblit v1.9.1