diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-10-12 12:06:55 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-10-12 12:06:55 -0400 |
| commit | 4949b6837f1a2ef103f58659c7692f01378128f7 (patch) | |
| tree | 5d53313029624492c15888345167a4146d1ea918 /CHANGELOG.md | |
| parent | 6aff5900f79721783599a7ab9fe29074e4050544 (diff) | |
| parent | f55416d9f45afcb310246426366cd261f138029f (diff) | |
| download | chat-4949b6837f1a2ef103f58659c7692f01378128f7.tar.gz chat-4949b6837f1a2ef103f58659c7692f01378128f7.tar.bz2 chat-4949b6837f1a2ef103f58659c7692f01378128f7.zip | |
Merge branch 'master' into typos
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 66e430f7c..eac1e61e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,9 @@ ## UNDER DEVELOPMENT - Release v1.1.0 --The "UNDER DEVELOPMENT" section of the Mattermost changelog appears in the product's `master` branch to note key changes committed to master and are on their way to the next stable release. When a stable release is pushed the "UNDER DEVELOPMENT" heading is removed from the final changelog of the release. -- --- **Final release anticipated:** 2015-10-16 +The "UNDER DEVELOPMENT" section of the Mattermost changelog appears in the product's `master` branch to note key changes committed to master and are on their way to the next stable release. When a stable release is pushed the "UNDER DEVELOPMENT" heading is removed from the final changelog of the release. + +- **Final release anticipated:** 2015-10-16 ### Release Highlights @@ -20,7 +20,6 @@ Integrations Documentation -- Contents of `/docs` now hosted at docs.mattermost.org - Added documentation on config.json and System Console settings - Docker Toolbox replaces deprecated Boot2Docker instructions in container install documentation |