andre.peters ba105c9b83 Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev		2018-01-18 22:10:40 +01:00
..
Dockerfiles	[Web] Important fixes for quarantaine; other minor changes	2018-01-17 15:23:33 +01:00
assets	Update site.nextcloud.custom	2018-01-11 23:06:09 +01:00
conf	Merge pull request #915 from tiirex9/master	2018-01-18 10:27:14 +01:00
web	Merge branch 'dev' of https://github.com/mailcow/mailcow-dockerized into dev	2018-01-18 22:10:40 +01:00