André Peters b175125d02 Merge branch 'dev' into master		2018-02-28 15:38:56 +01:00
..
Dockerfiles	Merge branch 'dev' into master	2018-02-28 15:38:56 +01:00
assets	[Helper] Nextcloud 13; Additional header for Nextcloud site	2018-02-18 20:59:32 +01:00
conf	Merge pull request #1090 from extremeshok/patch-5	2018-02-26 18:54:04 +01:00
web	Merge branch 'dev' into master	2018-02-28 15:38:56 +01:00