"...tdt4240-progark-project.git" did not exist on "ec3023c9c07325dae813110e83d583796c0e20ae"

LoginForm.vue

3 years ago

Merge branch 'main' into 'component_fixes' · 83e9d182

Titus Netland authored 3 years ago

# 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

83e9d182

History

Merge branch 'main' into 'component_fixes'

Titus Netland authored 3 years ago

# 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