Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334219 )
Change subject: Merge branch 'master' into deployment
......................................................................
Merge branch 'master' into deployment
a5a7c70 Update libraries (no more Stomp!)
Also update vendor and stop nulling out packages-dev in composer.lock
Change-Id: Ifb1fc23bf4c8d717e4b992a076c39890ff84e7d4
---
M composer.lock
M vendor
2 files changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/19/334219/1
diff --git a/composer.lock b/composer.lock
index 31128a6..0f07766 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1204,9 +1204,6 @@
"time": "2015-11-05 07:14:57"
}
],
-<<<<<<< HEAD (cd058a Merge branch 'master' into deployment)
- "packages-dev": null,
-=======
"packages-dev": [
{
"name": "doctrine/instantiator",
@@ -2265,7 +2262,6 @@
"time": "2016-11-23 20:04:58"
}
],
->>>>>>> BRANCH (a5a7c7 Update libraries (no more Stomp!))
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
diff --git a/vendor b/vendor
index 4260d17..e3c1e1c 160000
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 4260d175c1691436047aa1e1d8fb19c50b823f03
+Subproject commit e3c1e1c5474b032280763d753c31479e942124bf
--
To view, visit https://gerrit.wikimedia.org/r/334219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb1fc23bf4c8d717e4b992a076c39890ff84e7d4
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
