Skip to content
GitLab
Commit 4907cb17 authored by Grégoire GRZECZKOWICZ's avatar Grégoire GRZECZKOWICZ
Browse files

Merge branch 'master' into 'develop' 

Ajout du mdp

See merge request br/chocapix-server!6
parents 9657bccc df13fb2d
Pipeline #6430 passed with stage
in 1 minute
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 4907cb17
......@@ -11,3 +11,4 @@ secret_key.txt
venv/
*.bak
bars_django/settings/prod.py
.admin_mdp
\ No newline at end of file
Supports Markdown
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