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/Coursebook.vue # aleksis/apps/alsijil/frontend/components/coursebook/CoursebookDateSelect.vue
No related branches found
No related tags found
Showing
- aleksis/apps/alsijil/frontend/components/coursebook/Coursebook.vue 11 additions, 5 deletions...pps/alsijil/frontend/components/coursebook/Coursebook.vue
- aleksis/apps/alsijil/frontend/components/coursebook/CoursebookDateSelect.vue 4 additions, 4 deletions...l/frontend/components/coursebook/CoursebookDateSelect.vue
- aleksis/apps/alsijil/frontend/components/coursebook/CoursebookEmptyMessage.vue 4 additions, 4 deletions...frontend/components/coursebook/CoursebookEmptyMessage.vue
- aleksis/apps/alsijil/frontend/components/coursebook/coursebook.graphql 4 additions, 4 deletions...alsijil/frontend/components/coursebook/coursebook.graphql
- aleksis/apps/alsijil/frontend/components/coursebook/documentation/Documentation.vue 1 addition, 4 deletions...end/components/coursebook/documentation/Documentation.vue
- aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonNotes.vue 15 additions, 5 deletions...ntend/components/coursebook/documentation/LessonNotes.vue
- aleksis/apps/alsijil/models.py 6 additions, 5 deletionsaleksis/apps/alsijil/models.py
- aleksis/apps/alsijil/rules.py 10 additions, 2 deletionsaleksis/apps/alsijil/rules.py
- aleksis/apps/alsijil/schema/__init__.py 4 additions, 3 deletionsaleksis/apps/alsijil/schema/__init__.py
- aleksis/apps/alsijil/schema/documentation.py 13 additions, 9 deletionsaleksis/apps/alsijil/schema/documentation.py
- aleksis/apps/alsijil/util/predicates.py 54 additions, 8 deletionsaleksis/apps/alsijil/util/predicates.py
Loading
Please register or sign in to comment