diff --git a/.travis.yml b/.travis.yml index 9918e23..59a4489 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,13 @@ language: php php: - - "7.0" - "7.1" - "7.2" env: - CONTAO_VERSION=contao/core-bundle ~4.4.0 + - CONTAO_VERSION=contao/core-bundle ~4.5.0 + - CONTAO_VERSION=contao/core-bundle ~4.6.0 matrix: exclude: diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d561a9..5d9a0c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,9 +6,9 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## 3.1.0 - TBD +## 3.1.0 - 2018-01-11 -[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.4...develop) +[Full Changelog](https://github.com/netzmacht/contao-leaflet-maps/compare/3.0.4...3.1.0) ### Added diff --git a/composer.json b/composer.json index b4d493a..5a69266 100644 --- a/composer.json +++ b/composer.json @@ -61,8 +61,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", "dev-support/2.x": "2.0.x-dev" }, "contao-manager-plugin": "Netzmacht\\Contao\\Leaflet\\Bundle\\ContaoManager\\Plugin",