Commit 25e7cf60 authored by Grégoire GRZECZKOWICZ's avatar Grégoire GRZECZKOWICZ
Browse files

Merge branch 'master' into 'production'

Ajout du mdp

See merge request br/chocapix-server!7
parents a57d4d62 df13fb2d
......@@ -11,3 +11,4 @@ secret_key.txt
\ 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