Merge remote-tracking branch 'origin/master'

This commit is contained in:
Raynaldo Rivera 2014-11-06 16:27:46 -07:00
commit bc6e40ecf5
3 changed files with 6 additions and 4 deletions

4
.idea/inspectionProfiles/profiles_settings.xml generated Normal file → Executable file
View File

@ -1,7 +1,7 @@
<component name="InspectionProjectProfileManager"> <component name="InspectionProjectProfileManager">
<settings> <settings>
<option name="PROJECT_PROFILE" value="Project Default" /> <option name="PROJECT_PROFILE" />
<option name="USE_PROJECT_PROFILE" value="true" /> <option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" /> <version value="1.0" />
</settings> </settings>
</component> </component>

3
README.md Normal file → Executable file
View File

@ -1,5 +1,6 @@
allianceauth Alliance Auth
============ ============
Alliance service auth to help large scale alliances manage services. Alliance service auth to help large scale alliances manage services.
Built for "The 99 Percent" open for anyone to use Built for "The 99 Percent" open for anyone to use

3
requirements.txt Normal file → Executable file
View File

@ -1,9 +1,10 @@
# Python Stuff # - see bootstrap.sh # Python Stuff # - see bootstrap.sh
mysql-python mysql-python
evelink
dnspython dnspython
passlib passlib
xmpppy==0.5.0rc1 xmpppy==0.5.0rc1
python-openfire-0.2.3-beta
# Django Stuff # # Django Stuff #
django==1.6.1 django==1.6.1