fix: merge conflicts

This commit is contained in:
olivermrbl
2022-05-01 14:58:28 +02:00
60 changed files with 589 additions and 176 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
# medusa-plugin-sendgrid
# medusa-plugin-twilio-sms
Twilio SMS / Messaging plugin.