6 Commits

Author	SHA1	Message	Date
Brett Costabile	3bd40cc57e	Undoing my personal changes ... Oops, that shouldn't have happened.	2015-11-05 22:51:54 -05:00
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
Adarnof	e98bc36a9c	Removed all dependency on alliance membership ... Renamed permission 'alliance_member' 'member' Renamed multiple variables in settings.py and associated handlers in util Maybe it still works?	2015-09-17 04:42:36 +00:00
kaezon	0e2540eb4f	Initial commit with the alliance BG image, modified index page, and corrected password reset URL.	2015-05-20 01:36:26 +02:00
Raynaldo Rivera	19e19d89e4	Reformatted code for easy reading.	2014-10-26 16:47:21 -07:00
Raynaldo Rivera	e6d24b2a72	New changes	2014-10-15 17:48:39 -07:00