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

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

2017-04-07 00:26:59 -04:00

..

bundles

Replace third party client libraries with CDN delivered versions (#709)

2017-02-11 22:06:10 -05:00

registered

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

2017-04-07 00:26:59 -04:00