Skip to content
Snippets Groups Projects
Commit 112d4b6c authored by ynerant's avatar ynerant
Browse files

Merge branch 'consos' into rights

# Conflicts:
#	apps/logs/signals.py
#	note_kfet/settings/base.py
parents 30ce17b6 6c002aac
No related branches found
No related tags found
1 merge request!10Système de droits
Showing
with 323 additions and 105 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment