André Peters 987e884407 Merge branch 'master' into admin-login		2019-03-31 15:49:18 +02:00
..
Dockerfiles	Merge branch 'master' into admin-login	2019-03-31 15:49:18 +02:00
assets	[Assets] Fix Nextcloud site	2019-02-14 10:54:06 +01:00
conf	Merge branch 'master' into admin-login	2019-03-23 21:17:02 +01:00
web	Merge branch 'master' into admin-login	2019-03-31 15:49:18 +02:00