Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

oser-backend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

2bd4b15e

Commit 2bd4b15e authored 2 years ago by Hamza Touizrat

Downloads
- Plain Diff

Merge branch 'master' into 'verification_mail'

# Conflicts:
#   visits/migrations/0003_fix_db_trouble.py

parents 8a49368e c08cb55f

No related branches found

No related tags found

Loading

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
Dockerfile 9 additions, 0 deletions

Dockerfile
docker-compose.yml 38 additions, 0 deletions

docker-compose.yml
oser_backend/settings/dev.py 1 addition, 1 deletion

oser_backend/settings/dev.py
oser_backend/settings/production.py 0 additions, 2 deletions

oser_backend/settings/production.py
profiles/migrations/0017_auto_20221111_2210.py 18 additions, 0 deletions

profiles/migrations/0017_auto_20221111_2210.py
requirements.txt 57 additions, 47 deletions

requirements.txt
visits/migrations/0005_auto_20221111_2210.py 18 additions, 0 deletions

visits/migrations/0005_auto_20221111_2210.py

with 143 additions and 50 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