diff --git a/Dockerfile b/Dockerfile index 092c5c7..b67e58f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ ENV MAX_UPLOAD 128M ENV PSM_DB_PORT 3306 ENV UPDATE_INTERVAL 300 -ENV PHPSERVERMON_VER v3.2.2 +ENV PHPSERVERMON_VER v3.3.1 RUN mkdir /logs /run/nginx diff --git a/README.md b/README.md index a1c39b5..884f519 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,11 @@ # Supported tags and respective `Dockerfile` links +<<<<<<< HEAD `stable` [*(bpodwinski/docker-phpservermon)*](https://github.com/bpodwinski/docker-phpservermon)
`v3.3.0` [*(bpodwinski/docker-phpservermon/v3.3.0)*](https://github.com/bpodwinski/docker-phpservermon/tree/v3.3.0) +======= +`v3.3.1` [*(bpodwinski/docker-phpservermon/v3.3.1)*](https://github.com/bpodwinski/docker-phpservermon/tree/v3.3.1) +>>>>>>> 3.3.1 ### What is this ?