summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortill <till@php.net>2012-10-29 00:08:15 +0100
committertill <till@php.net>2012-10-29 00:08:40 +0100
commitf2bc8599f850131bb4118ebd5dd7118717d50c24 (patch)
tree6f80f2d84445c0a79b4e7dbc6aa1926c17fdc89d
parent111acf180dfacf7f049d4d7b6f93b79560f51fc4 (diff)
Ignore plugin_manager plugin.
Allow packagist.
-rw-r--r--.gitignore1
-rw-r--r--composer.json-dist3
2 files changed, 1 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 339031096..30b18a9a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ plugins/*/config.inc.php
# 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 c07b8f484..cfa825a25 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/"
},