Merge branch 'add-docker-to-changelog' into 'master'

Add docker to changelog See merge request !1293

Merge branch 'add-docker-to-changelog' into 'master'
Add docker to changelog See merge request !1293
88326858 · Dmitriy Zaporozhets · 6c68db60 · 2a0ee91f · 88326858 · 88326858
Commit 88326858 authored Dec 03, 2014 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

CHANGELOG CHANGELOG +1 -1

docker/Dockerfile docker/Dockerfile +0 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,7 +17,7 @@ v 7.6.0
  - Change maximum avatar file size from 100KB to 200KB
  -
  -
-  -
+  - In the docker directory is a container template based on the Omnibus packages.
  -
  -

--- a/docker/Dockerfile
+++ b/docker/Dockerfile
 FROM ubuntu:14.04
-MAINTAINER Vincent Robert <vincent.robert@genezys.net>
 # Install required packages
 RUN apt-get update -q \