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

---
 .gitignore |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/.gitignore b/.gitignore
index f55131f..30b18a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,14 @@
 logs/*
 temp/*
 config/*
-plugins/*/config.inc.php
\ No newline at end of file
+plugins/*/config.inc.php
+
+# this is for the sample plugin (via composer)
+plugins/rcsample
+plugins/plugin_manager
+
+# composer-related
+composer.json
+composer.phar
+composer.lock
+vendor

--
Gitblit v1.9.1