From: kaldari <rkaldari@wikimedia.org>
Date: Wed, 20 May 2015 21:47:14 +0000 (+0000)
Subject: Merge "Bumping lightncandy version from 0.18 to 0.21"
X-Git-Tag: 1.31.0-rc.0~11345
X-Git-Url: http://git.cyclocoop.org/%27-%20%20.%20url_absolue%28find_in_path%28%27spip_style.css%27%29%29%20%20%20.%20url_absolue%28find_in_path%28%27prive/spip_style.css%27%29%29%20.%20%27?a=commitdiff_plain;h=e1611fec8d9578711921945465ab770a789501af;p=lhc%2Fweb%2Fwiklou.git

Merge "Bumping lightncandy version from 0.18 to 0.21"
---

e1611fec8d9578711921945465ab770a789501af
diff --cc composer.json
index 0789eee02a,88c5140609..2f6cc42467
--- a/composer.json
+++ b/composer.json
@@@ -24,10 -24,9 +24,10 @@@
  		"php": ">=5.3.3",
  		"psr/log": "1.0.0",
  		"wikimedia/cdb": "1.0.1",
 +		"wikimedia/assert": "0.2.2",
  		"wikimedia/composer-merge-plugin": "1.0.0",
  		"wikimedia/utfnormal": "1.0.2",
- 		"zordius/lightncandy": "0.18"
+ 		"zordius/lightncandy": "0.21"
  	},
  	"require-dev": {
  		"jakub-onderka/php-parallel-lint": "~0.8",