6 Commits

Author SHA1 Message Date
Daniel Quinn
af9ec47d9b Reduce duplication in docker-compose.env.example
See #404 for more info on where this came from.
2018-09-22 15:27:22 +01:00
Daniel Quinn
e7fefc40fe Merge branch 'master' into mcronce-disable_encryption 2018-06-17 16:32:51 +01:00
Daniel Quinn
3cfdb10f8f Clean up the text a bit 2018-06-15 14:44:19 +01:00
ahyear
ca97caf68e update docker-compose.env for mail Consumptionu$ 2018-06-15 15:31:29 +02:00
Daniel Quinn
2603946010 Document the big changes for 2.0 2018-05-28 12:58:28 +01:00
Tikitu de Jager
438b161a25 Move docker-compose.env to docker-compose.env.example & adjust docs
This file, like `docker-compose.yml`, should be edited by the user. To
avoid merge conflicts when pulling updates, the edited version should
not be committed to the repository.
2016-02-19 22:51:49 +02:00