root fae542534d Merge remote-tracking branch 'origin/master' into dev		2018-02-08 19:54:14 +01:00
..
Dockerfiles	Merge remote-tracking branch 'origin/master' into dev	2018-02-08 19:54:14 +01:00
assets	[Helper] Nextcloud: Use correct IPv6 subnet	2018-02-01 13:29:54 +01:00
conf	[Dovecot] Inconsistent view fix	2018-02-05 21:55:37 +01:00
web	Merge remote-tracking branch 'origin/master' into dev	2018-02-08 19:54:14 +01:00