ami/tl-vikunja
1
0
Fork 0
Code Activity

Merge branch 'main' into feature/login-improvements

Browse Source 
# Conflicts:
#	src/components/misc/no-auth-wrapper.vue
#	src/styles/components/_index.scss
#	src/views/user/Login.vue
#	src/views/user/Register.vue
This commit is contained in:
kolaente
2022-01-08 13:44:35 +01:00
parent 9c5613ad98 f4fee26fe4
commit 310578d349
93 changed files with 1761 additions and 2501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/user/RequestPasswordReset.vue
View File

@ -35,7 +35,7 @@
>
{{ $t('user.auth.resetPasswordAction') }}
</x-button>
<x-button :to="{ name: 'user.login' }" type="secondary">
<x-button :to="{ name: 'user.login' }" variant="secondary">
{{ $t('user.auth.login') }}
</x-button>
</div>