Joshua Hesketh f8ff11a1e3 Merge branch 'master' into patch-4		2019-04-02 17:08:19 +11:00
..
assets	[Assets] Fix Nextcloud site	2019-02-14 10:54:06 +01:00
conf	I'm an idiot	2019-04-01 22:52:45 +02:00
Dockerfiles	Merge branch 'master' into patch-4	2019-04-02 17:08:19 +11:00
web	[Web] Fix totp qr code, fixes #2490	2019-04-01 22:17:44 +02:00