Merge branch 'models' into qwann/html/base

2017-02-18 01:47:51 +01:00 · 2017-02-18 01:47:51 +01:00 · 4f73d3cc1a
commit 4f73d3cc1a
parent 2433eb40c1 87967dbad7
23 changed files with 356 additions and 0 deletions
--- a/evenementiel/settings_dev.py
+++ b/evenementiel/settings_dev.py
@ -34,6 +34,7 @@ ALLOWED_HOSTS = []
 INSTALLED_APPS = [
    'equipment.apps.EquipmentConfig',
    'event.apps.EventConfig',
+    'user.apps.UserConfig',
    'django.contrib.admin',
    'django.contrib.auth',
    'django.contrib.contenttypes',