From e34bda96496f587ee84d70eba4a22ca9a59ad36e Mon Sep 17 00:00:00 2001
From: nscbrandb <bernhard.brandstetter@fhstp.ac.at>
Date: Tue, 17 May 2016 15:47:33 +0200
Subject: [PATCH] =?UTF-8?q?Composer=20Merge-Plugin=20f=C3=BCr=20AddOn-spez?=
 =?UTF-8?q?ifische=20composer.json's?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index b0dad7641..0e36d6f6f 100755
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,8 @@
 	"zetacomponents/workflow": "1.*",
 	"zetacomponents/document": "1.*",
 	"zetacomponents/workflow-database-tiein": "1.*",
-	"zetacomponents/workflow-event-log-tiein": "1.*"
+	"zetacomponents/workflow-event-log-tiein": "1.*",
+    "wikimedia/composer-merge-plugin": "^1.3"
   },
   "require-dev": 
   {
@@ -63,5 +64,19 @@
   "config":
   {
     "bin-dir": "bin"
-  }
+  },
+  
+	"extra": {
+	    "merge-plugin": {
+	        "include": [
+	            "composer.json",
+	            "addons/*/composer.json"
+	        ],
+	        "recurse": true,
+	        "replace": false,
+	        "merge-dev": false,
+	        "merge-extra": false
+	    }
+	}
+  
 }