Skip to content
Snippets Groups Projects
Commit 00aac337 authored by Ina Martini's avatar Ina Martini
Browse files

Merge branch 'dev' into enhancement/47/general-cleanup

# Conflicts:
#	src/components/HelpComponent.vue
#	src/views/ManageChallengeView.vue
#	src/views/ManageGoalView.vue
#	src/views/ViewProfileView.vue
parents 6b6a1649 ce764402
No related branches found
No related tags found
3 merge requests!66Final merge,!57General cleanup of application,!4Pipeline fix
Showing
with 255 additions and 218 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment