jenkins-bot has submitted this change and it was merged.

Change subject: Merge branch 'master' into deployment
......................................................................


Merge branch 'master' into deployment

and update vendor submodule

1d22c6a Comment to explain salt-wierdness
9741d00 Update CiviCRM submodule
50ddfaf Update SmashPig library

Change-Id: I6c4c4d672137f287fafb1335287e95281de3effa
---
M vendor
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ejegg: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/vendor b/vendor
index 555b3e7..36f9e5b 160000
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit 555b3e71552d230bddfc9aa7a7f7c2bcd98970bd
+Subproject commit 36f9e5b9d0e7cfe125dbc18ccf479ef6d7847edd

-- 
To view, visit https://gerrit.wikimedia.org/r/322003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c4c4d672137f287fafb1335287e95281de3effa
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to