Brett Costabile 15e959b265 Merged with R4stl1n master ...

Had to resolve a small conflict in email. Replaced mine with upstream.

2015-11-05 22:37:37 -05:00

..

managers

Merged with R4stl1n master

2015-11-05 22:37:37 -05:00

__init__.py

…

admin.py

More random changes

2015-11-01 16:41:16 -05:00

forms.py

…

models.py

More random changes

2015-11-01 16:41:16 -05:00

tests.py

Reformatted code for easy reading.

2014-10-26 16:47:21 -07:00

views.py

Removed all dependency on alliance membership

2015-09-17 04:42:36 +00:00