Commit 23cdd110 authored by Michaël Paulon's avatar Michaël Paulon

Merge branch 'master' into 'mikachu_django_2'

# Conflicts:
#   .gitignore
parents 6eb1e517 a6bf7376
......@@ -17,4 +17,4 @@ note_kfet/settings.py
# Les fichiers qui trainent
.psql_history
certs
certs/*
certs/*
Markdown is supported
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