Michael Kuron c30448c4d8 Merge branch 'master' of https://github.com/andryyy/mailcow-dockerized into recipient_map ... Conflicts: data/web/inc/init_db.inc.php		2018-01-27 17:22:08 +01:00
..
Dockerfiles	Merge branch 'master' of https://github.com/andryyy/mailcow-dockerized into recipient_map	2018-01-27 17:22:08 +01:00
assets	[Helper] Fix acme challenge for Nextcloud sub domain site, remove plain listener	2018-01-27 15:22:16 +01:00
conf	Merge branch 'master' of https://github.com/andryyy/mailcow-dockerized into recipient_map	2018-01-27 17:22:08 +01:00
web	Merge branch 'master' of https://github.com/andryyy/mailcow-dockerized into recipient_map	2018-01-27 17:22:08 +01:00