From f2bc8599f850131bb4118ebd5dd7118717d50c24 Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Sun, 28 Oct 2012 19:08:40 -0400
Subject: [PATCH] Ignore plugin_manager plugin. Allow packagist.

---
 .gitignore         |    1 +
 composer.json-dist |    3 ---
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3390310..30b18a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 
 # this is for the sample plugin (via composer)
 plugins/rcsample
+plugins/plugin_manager
 
 # composer-related
 composer.json
diff --git a/composer.json-dist b/composer.json-dist
index c07b8f4..cfa825a 100644
--- a/composer.json-dist
+++ b/composer.json-dist
@@ -4,9 +4,6 @@
     "license": "GPL-3.0",
     "repositories": [
         {
-            "packagist": false
-        },
-        {
             "type": "composer",
             "url": "http://plugins.roundcube.net/"
         },

--
Gitblit v1.9.1