Merge branch 'master' into dev

author jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>

Sun, 9 May 2021 14:22:21 +0000 (16:22 +0200)

committer jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>

Sun, 9 May 2021 14:22:21 +0000 (16:22 +0200)
author jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Sun, 9 May 2021 14:22:21 +0000 (16:22 +0200)
committer jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
Sun, 9 May 2021 14:22:21 +0000 (16:22 +0200)
diff --cc src/documents/templates/registration/logged_out.html
Simple merge
diff --cc src/documents/templates/registration/login.html
Simple merge
author	jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
	Sun, 9 May 2021 14:22:21 +0000 (16:22 +0200)
committer	jonaswinkler <17569239+jonaswinkler@users.noreply.github.com>
	Sun, 9 May 2021 14:22:21 +0000 (16:22 +0200)
		1	2
src/documents/templates/registration/logged_out.html	patch \|	diff1 \|	diff2 \|	blob \| history
src/documents/templates/registration/login.html	patch \|	diff1 \|	diff2 \|	blob \| history