James Cole b21461c824 Merge branch 'develop' into 5.8-dev ...

# Conflicts:
#	resources/views/auth/login.twig
#	resources/views/auth/mfa.twig
#	resources/views/auth/passwords/email.twig
#	resources/views/auth/passwords/reset.twig
#	resources/views/auth/register.twig

2022-10-24 19:35:47 +02:00

..

index.twig

Merge branch 'develop' into 5.8-dev

2022-10-24 19:35:47 +02:00

search.twig

Move v1 views

2022-01-29 14:15:34 +01:00