From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 17 Jul 2017 17:21:13 +0000 (+0000)
Subject: Merge "Update wikimedia/composer-merge-plugin from 1.4.0 -> 1.4.1"
X-Git-Tag: 1.31.0-rc.0~2703
X-Git-Url: http://git.cyclocoop.org//%22%22._DIR_PLUGIN_FULLCALENDAR.%22prive/themes/spip/images/event_edit.png/%22?a=commitdiff_plain;h=99661709a6382e56e1cf738860b248b460cae9ed;p=lhc%2Fweb%2Fwiklou.git

Merge "Update wikimedia/composer-merge-plugin from 1.4.0 -> 1.4.1"
---

99661709a6382e56e1cf738860b248b460cae9ed