Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

zesje
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

981bb125

Commit 981bb125 authored 5 years ago by RABijl

Downloads
- Plain Diff

fixes merge conflicts with develop

parents c337fa25 ab3c2799

No related branches found

No related tags found

1 merge request!6Draw pdf box

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

migrations/versions/b46a2994605b_.py 10 additions, 7 deletions

migrations/versions/b46a2994605b_.py
package.json 2 additions, 1 deletion

package.json
zesje/api/__init__.py 3 additions, 3 deletions

zesje/api/__init__.py
zesje/api/exams.py 14 additions, 1 deletion

zesje/api/exams.py
zesje/api/mult_choice.py 53 additions, 32 deletions

zesje/api/mult_choice.py
zesje/database.py 8 additions, 8 deletions

zesje/database.py

with 90 additions and 52 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 sign in to comment