Skip to content

Commit c2ed8bf

Browse files
committed
Merge branch 'hotfix-3.5.1' into stable
2 parents 95e8bc3 + be62157 commit c2ed8bf

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

Diff for: CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [3.5.1] - 2018-05-26
8+
### Changed
9+
- Matomo 3.5.1
10+
711
## [3.5.0] - 2018-05-16
812
### Added
913
- MariaDB ssl
@@ -68,6 +72,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
6872
## 2.16.2 - 2016-09-24
6973
Initial release
7074

75+
[3.5.1]: https://github.com/osixia/docker-matomo/compare/v3.5.0...v3.5.1
7176
[3.5.0]: https://github.com/osixia/docker-matomo/compare/v3.4.0...v3.5.0
7277
[3.4.0]: https://github.com/osixia/docker-matomo/compare/v3.3.0...v3.4.0
7378
[3.3.0]: https://github.com/osixia/docker-matomo/compare/v3.2.1...v3.3.0

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME = osixia/matomo
2-
VERSION = 3.5.0
2+
VERSION = 3.5.1
33

44
.PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
55

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
[hub]: https://hub.docker.com/r/osixia/matomo/
88

9-
Latest release: 3.5.0 - Matomo 3.5.0 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/matomo/) 
9+
Latest release: 3.5.1 - Matomo 3.5.1 - [Changelog](CHANGELOG.md) | [Docker Hub](https://hub.docker.com/r/osixia/matomo/) 
1010

1111
**A docker image to run Matomo (formerly Piwik).**
1212
> [matomo.org](https://matomo.org)

Diff for: image/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM osixia/web-baseimage:1.1.1
22
MAINTAINER Bertrand Gouny <[email protected]>
33

44
# Matomo version
5-
ARG MATOMO_VERSION=3.5.0
5+
ARG MATOMO_VERSION=3.5.1
66

77
# MariaDB version
88
ARG MARIADB_MAJOR=10.2

0 commit comments

Comments
 (0)