From: Bryan Davis <bd808@wikimedia.org>
Date: Fri, 26 Jun 2015 20:37:54 +0000 (-0600)
Subject: Bump wikimedia/composer-merge-plugin to 1.2.0
X-Git-Tag: 1.31.0-rc.0~10960^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=5b8b5a541ff59b6ca2cf93a25f64bbc18a97422a;p=lhc%2Fweb%2Fwiklou.git

Bump wikimedia/composer-merge-plugin to 1.2.0

* Mark as compatible with composer-plugin-api >=1.0, <2.0
* Hook post-install/post-update so the plugin can take effect on initial
  install
* Fix crash when root package includes a branch-alias (#26)

Change-Id: I2e0d141f6e6a80d9667e60a16bec00d52a5eedea
---

diff --git a/composer.json b/composer.json
index 7419eb5b38..22bffbe1cb 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
 		"psr/log": "1.0.0",
 		"wikimedia/cdb": "1.0.1",
 		"wikimedia/assert": "0.2.2",
-		"wikimedia/composer-merge-plugin": "1.1.0",
+		"wikimedia/composer-merge-plugin": "1.2.0",
 		"wikimedia/utfnormal": "1.0.2",
 		"zordius/lightncandy": "0.21"
 	},