Merge remote branch 'origin/master'

This commit is contained in:
2010-03-01 00:23:12 +01:00
8 changed files with 39 additions and 26 deletions

View File

@@ -89,7 +89,7 @@ INSTALLED_APPS = (
'django_cron',
'eve_proxy',
'eve_api',
'mumble',
# 'mumble',
'sso',
)
@@ -99,7 +99,7 @@ LOGIN_REDIRECT_URL = "/profile"
### EVE Corp Info
EVE_CORP_ID = 1018389948
ALLOWED_CORPS = [1018389948]
### Jabber Service Settings