Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/238840
Change subject: Merge branch 'master' into deployment ...................................................................... Merge branch 'master' into deployment baa0b75 Set up import for Major Gifts events payment/invitation tool da1b61d Update SmashPig to get AstroPay audit fix And update vendor submodule. Change-Id: I36140a5646abdcbb92aa3634184fd8fdb6abbc2c --- M sites/all/modules/offline2civicrm/offline2civicrm.info M vendor 2 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/40/238840/1 diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.info b/sites/all/modules/offline2civicrm/offline2civicrm.info index bbd0b75..f7fc5a9 100644 --- a/sites/all/modules/offline2civicrm/offline2civicrm.info +++ b/sites/all/modules/offline2civicrm/offline2civicrm.info @@ -23,8 +23,3 @@ files[] = TrilogyFile.php files[] = WmfImportFile.php files[] = WmfOrgImportFile.php -<<<<<<< HEAD (abc34b Update vendor libs) -======= -files[] = tests/includes/BaseChecksFileTest.php - ->>>>>>> BRANCH (da1b61 Update SmashPig to get AstroPay audit fix) diff --git a/vendor b/vendor index 7d97e12..dbbcb0e 160000 --- a/vendor +++ b/vendor -Subproject commit 7d97e129935a6f71ede905010cba4d72832e9301 +Subproject commit dbbcb0efb9fe003aa009487b2b6cc75689616b66 -- To view, visit https://gerrit.wikimedia.org/r/238840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I36140a5646abdcbb92aa3634184fd8fdb6abbc2c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: deployment Gerrit-Owner: Ejegg <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
