require 7.1 + not need to set OBJECT_STORAGE_URL

CHANGELOG.md

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+## 1.0.2 - 2018-05-15
+
+No need to set the `OBJECT_STORAGE_URL` ENV var
+
+
+## 1.0.1 - 2018-04-27
+
+Explicitly require PHP 7.1
+
+
 ## 1.0.0 - 2018-02-27
 
 Initial release

README.md

@@ -6,11 +6,8 @@ This plugin provides an [Object Storage](https://help.fortrabbit.com/object-stor
 
 ## Requirements
 
-<<<<<<< HEAD
-This plugin requires Craft CMS 3.0.0 or later.
-=======
 This plugin requires Craft CMS 3.0.0 and PHP 7.1 or later. There is another plugin to provide this for Craft 2 over [here](https://github.com/fortrabbit/craft-s3-fortrabbit).
->>>>>>> c246071ac51493f208540236d6a24a10a1abe5ee
+
 
 
 ## Installation

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "fortrabbit/craft-object-storage",
   "description": "A Craft 3 plugin that integrates with fortrabbit's S3 compatible Object Storage",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "type": "craft-plugin",
   "keywords": [
     "craftcms",
@@ -19,6 +19,7 @@
     }
   ],
   "require": {
+    "php": ">=7.1.0",
     "craftcms/cms": "^3.0.0",
     "league/flysystem-aws-s3-v3": "^1.0.18"
   },