André Peters 1f09544f32 Fix conflict		2018-02-16 22:44:02 +01:00
..
Dockerfiles	Fix conflict	2018-02-16 22:44:02 +01:00
assets	[Helper] Nextcloud: Use correct IPv6 subnet	2018-02-01 13:29:54 +01:00
conf	[SOGo] Increase workers again	2018-02-14 11:26:55 +01:00
web	Fix conflict	2018-02-16 22:44:02 +01:00