Merge branch 'release/3.1.0'

Author: geerteltink

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 3.1.0 - TBD
+## 3.1.0 - 2018-06-22
 
 ### Added
 
@@ -29,28 +29,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
-## 3.0.7 - TBD
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 3.0.6 - 2018-04-16
 
 ### Added

composer.json

@@ -20,8 +20,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0.x-dev",
-            "dev-develop": "3.1.x-dev"
+            "dev-master": "3.1.x-dev",
+            "dev-develop": "3.2.x-dev"
         },
         "zf": {
             "component-whitelist": [