Skip to content
Snippets Groups Projects
Commit 5ea34de6 authored by Trygve Jørgensen's avatar Trygve Jørgensen
Browse files

Merge remote-tracking branch 'origin/dev' into enhancement/wcag 

# Conflicts:
#	src/views/ConfigBiometricView.vue
#	src/views/ConfigSpendingItemsAmountView.vue
#	src/views/ConfigSpendingItemsTotalAmountView.vue
parents 41e17923 beb4abff
No related branches found
No related tags found
2 merge requests!66Final merge,!62WCAG fixes
Hide whitespace changes
Inline Side-by-side
Showing
with 46 additions and 16 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment