Skip to content
Snippets Groups Projects
Commit 23cdd110 authored by Michaël Paulon's avatar Michaël Paulon
Browse files

Merge branch 'master' into 'mikachu_django_2' 

# Conflicts:
#   .gitignore
parents 6eb1e517 a6bf7376
No related branches found
No related tags found
1 merge request!1Scripts and profile crash fix
This commit is part of merge request !1. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
.gitignore
+ 1
− 1
Edit View file @ 23cdd110
......@@ -17,4 +17,4 @@ note_kfet/settings.py
# Les fichiers qui trainent
.psql_history
certs
certs/*
certs/*
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