Scripts and profile crash fix (!1) · Merge requests · BDE / Note Kfet 2018 · GitLab

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

Couldn't fetch the linked file.

Merged Michaël Paulon requested to merge mikachu_django_2 into master 6 years ago

Viewing commit 23cdd110

Show latest version

1 file

+ 1

− 1

23cdd110

Merge branch 'master' into 'mikachu_django_2' · 23cdd110
Michaël Paulon authored 6 years ago
```
# Conflicts:
#   .gitignore
```

+ 1

− 1

@@ -17,4 +17,4 @@ note_kfet/settings.py

# Les fichiers qui trainent

.psql_history

certs

certs/*

certs/*