5 Commits

Author	SHA1	Message	Date
Daniel Quinn	c9f35a7da2	Merge branch 'master' into mcronce-disable_encryption	2018-06-17 16:32:51 +01:00
Daniel Quinn	d5876cc97d	Clean up the text a bit	2018-06-15 14:44:19 +01:00
ahyear	9b00a98de3	update docker-compose.env for mail Consumptionu$	2018-06-15 15:31:29 +02:00
Daniel Quinn	9df06fbb12	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