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/themes/advanced/img/colorpicker.jpg | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/program/js/tiny_mce/themes/advanced/img/colorpicker.jpg b/program/js/tiny_mce/themes/advanced/img/colorpicker.jpg index b4c542d..b1a377a 100644 --- a/program/js/tiny_mce/themes/advanced/img/colorpicker.jpg +++ b/program/js/tiny_mce/themes/advanced/img/colorpicker.jpg Binary files differ -- Gitblit v1.9.1