Merge branch 'feature/learningPathVisu' of bitbucket.org:iterativ/vbv_lernwelt into feature/learningPathVisu
# Conflicts: # client/src/components/circle/LearningPathCircleDiagram.vue
This commit is contained in:
commit
2286bbbf96
# Conflicts: # client/src/components/circle/LearningPathCircleDiagram.vue