Merge branch 'master' of https://github.com/Adarnof/allianceauth into custom_user

This commit is contained in:
Adarnof
2017-06-06 21:48:02 -04:00
23 changed files with 1124 additions and 305 deletions

View File

@@ -35,6 +35,7 @@ INSTALLED_APPS = [
'optimer',
'corputils',
'fleetactivitytracking',
'fleetup',
'notifications',
'esi',
'permissions_tool',
@@ -580,6 +581,10 @@ LOGGING = {
'handlers': ['log_file', 'console', 'notifications'],
'level': 'ERROR',
},
'fleetup': {
'handlers': ['log_file', 'console', 'notifications'],
'level': 'DEBUG',
},
'util': {
'handlers': ['log_file', 'console', 'notifications'],
'level': 'DEBUG',