Fix readme after Docker compose cleanup (!1086) · Merge requests · GitLab.org / gitter / webapp · GitLab

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

username-removed-892863 requested to merge feature/fix-readme-after-docker-refactor into develop Sep 10, 2017

Fix README.md after Docker compose cleanup

Remove merge conflict markers
Restore some lost changes