André 7bb1e2e40e Fix conflicts		2017-11-14 10:48:04 +01:00
..
assets	[Assets] Move nextcloud files to subfolder nextcloud	2017-10-11 11:20:48 +02:00
conf	[Rspamd] Set task timeout to 12s	2017-11-10 19:58:56 +01:00
Dockerfiles	[Compose] New images, Nginx checks for SOGo before bootstrapping	2017-11-14 10:44:22 +01:00
web	Fix conflicts	2017-11-14 10:48:04 +01:00