Merge branch 'develop' into 'feature/calendar-fix'
# Conflicts: # website/studerende-dk/src/components/blocks/Calendar.vue
backend/Dockerfile
0 → 100644
backend/server/server.py
0 → 100644
docker-compose.yml
0 → 100644
server/deploy.sh
0 → 100755
server/redeploy.sh
0 → 100755
server/slack-notifier.sh
0 → 100755