Merge branch 'wp54' into master

ItinerisLtd · Aug 18, 2020 · db7a9cc · db7a9cc
2 parents 831269c + 9dc06c1
commit db7a9cc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,9 @@
     },
     "conflict": {
         "itinerisltd/phpmailer-mailhog": "*",
-        "wpackagist-plugin/sendgrid-email-delivery-simplified": "*"
+        "wpackagist-plugin/sendgrid-email-delivery-simplified": "*",
+        "johnpbloch/wordpress-core": "^5.5",
+        "roots/wordpress": "^5.5"
     },
     "require-dev": {
         "10up/wp_mock": "^0.4.2",

diff --git a/composer.lock b/composer.lock