Merge branch 'develop'

recca0120 · Jul 22, 2016 · f2e8ea4 · f2e8ea4
2 parents c4fdc27 + 9be1864
commit f2e8ea4
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -13,11 +13,12 @@
         "php": ">=5.5.9",
         "illuminate/console": "~5.1",
         "illuminate/database": "~5.1",
+        "illuminate/encryption": "~5.1",
+        "illuminate/encryption": "~5.1",
         "illuminate/filesystem": "~5.1",
         "illuminate/routing": "~5.1",
         "paragonie/random_compat": "~1.1",
-        "symfony/finder": "2.7.*|2.8.*|3.0.*",
-        "illuminate/encryption": "^5.2"
+        "symfony/finder": "2.7.*|2.8.*|3.0.*"
     },
     "require-dev": {
         "nesbot/carbon": "~1.20",