Merge branch 'develop'

Author: gabidj

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.0.0 - 2018-05-14
+
+### Changed
+* updated dependencies
+
+### Added
+* Nothing
+
+### Deprecated
+* Nothing
+
+### Removed
+* Nothing
+
+### Fixed
+* Nothing
+
+
 ## 0.1.3 - 2017-04-21
 
 ### Changed

composer.json

@@ -5,15 +5,15 @@
   "license": "MIT",
   "authors": [
     {
-      "name": "n3vrax",
-      "email": "tibi@apidemia.com"
+      "name": "DotKernel Team",
+      "email": "team@dotkernel.com"
     }
   ],
   "require": {
     "php": "^7.1",
-    "zendframework/zend-servicemanager": "^3.3.0",
+    "zendframework/zend-servicemanager": "^3.3",
 
-    "dotkernel/dot-controller": "^0.3",
+    "dotkernel/dot-controller": "^1.0",
     "dotkernel/dot-mail": "^0.1"
   },
   "require-dev": {
@@ -32,8 +32,8 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "0.1-dev",
-      "dev-develop": "0.2-dev"
+      "dev-master": "1.0-dev",
+      "dev-develop": "1.1-dev"
     }
   }
 }