Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-09 00:26:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Manual conflict resoltuion for pull request #98

Browse Source
This commit is contained in:
Adarnof
2015-11-25 02:59:13 +00:00
parent fbabc97e74
commit 35277b7f33
6 changed files with 76 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
util/context_processors.py
View File

@@ -20,6 +20,11 @@ def alliance_name(request):
def jabber_url(request):
return {'JABBER_URL': settings.JABBER_URL}
def member_api_mask(request):
return {'MEMBER_API_MASK': settings.MEMBER_API_MASK}
def blue_api_mask(request):
return {'BLUE_API_MASK': settings.BLUE_API_MASK}
def domain_url(request):
return {'DOMAIN': settings.DOMAIN, 'MUMBLE_URL': settings.MUMBLE_URL,