Skip to content
Snippets Groups Projects
Commit 83e9d182 authored by Titus Netland's avatar Titus Netland
Browse files

Merge branch 'main' into 'component_fixes' 

# Conflicts:
#   src/components/CommunityComponents/NewCommunityForm.vue
#   src/components/CommunityComponents/NewItemForm.vue
#   src/components/FormComponents/LoginForm.vue
#   src/components/FormComponents/NewPasswordForm.vue
#   src/components/FormComponents/ResetPasswordForm.vue
parents b8823d34 7742eda4
No related branches found
No related tags found
1 merge request!72Components and views fixes
Pipeline #179100 failed
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 292 additions and 222 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