Skip to content
Snippets Groups Projects
Commit 5bf85bf3 authored by Julian's avatar Julian
Browse files

Merge remote-tracking branch 'origin/256-add-simple-course-book-list' into... 

Merge remote-tracking branch 'origin/256-add-simple-course-book-list' into 256-add-simple-course-book-list

# Conflicts:
#	aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonInformation.vue
parents 5202a41f ac8b93d7
No related branches found
No related tags found
2 merge requests!352Draft: Resolve "Add dialog with each lesson's students",!350Resolve "Add simple course book list"
Pipeline #178811 failed
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Hide whitespace changes
Inline Side-by-side
Showing
with 522 additions and 274 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