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

# Conflicts:
#	alliance_auth/settings.py.example
#	eveonline/views.py

Fix some tests.

2017-05-27 17:25:15 -04:00

..

static

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

2017-05-27 17:25:15 -04:00

templates

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

2017-05-27 17:25:15 -04:00