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

..

migrations

Correct migration syntax.

2017-03-24 10:03:56 -04:00

__init__.py

Adarnof's Little Things (#547)

2016-10-16 18:01:14 -04:00

admin.py

Adarnof's Little Things (#547)

2016-10-16 18:01:14 -04:00

apps.py

Adarnof's Little Things (#547)

2016-10-16 18:01:14 -04:00

form.py

added citadels and engineering complexes to timerboard (#602)

2016-12-20 22:59:02 -05:00

models.py

Adarnof's Little Things (#547)

2016-10-16 18:01:14 -04:00

tests.py

Added timerboard feature

2014-11-16 01:10:41 -07:00

views.py

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

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