Merge remote-tracking branch 'origin/master'

interpunkt · Apr 2, 2017 · d7b46fc · d7b46fc
2 parents b72bab1 + 158fb4d
commit d7b46fc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Namer for the VichUploaderBundle which slugifies the filename of the uploaded file",
     "type": "library",
     "require": {
-        "php": "^5.5",
+        "php": "^5.5|^7.0",
         "cocur/slugify": "^2.5",
         "vich/uploader-bundle": "^1.4"
     },