Merge remote-tracking branch 'origin/master'

# Conflicts: # composer.json
stuyam · Oct 13, 2017 · 36a2bdc · 36a2bdc
2 parents a369bb1 + 58057f4
commit 36a2bdc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "minimum-stability": "dev",
     "require": {
         "illuminate/support": "^5.0",
-        "twilio/sdk": "^4.10"
+        "twilio/sdk": "^4.10 || ^5.0"
     },
     "autoload": {
         "psr-4": {