xeniac/kasu
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Merge branch 'master' into css3_redesign

Browse Source 
# Conflicts:
#	requirements/base.txt
#	src/content/locale/de/LC_MESSAGES/django.mo
#	src/content/locale/de/LC_MESSAGES/django.po
#	src/events/locale/de/LC_MESSAGES/django.mo
#	src/events/locale/de/LC_MESSAGES/django.po
#	src/kasu/locale/de/LC_MESSAGES/django.po
#	src/mahjong_ranking/locale/de/LC_MESSAGES/django.mo
#	src/mahjong_ranking/locale/de/LC_MESSAGES/django.po
#	src/maistar_ranking/locale/de/LC_MESSAGES/django.po
#	src/membership/locale/de/LC_MESSAGES/django.mo
#	src/membership/locale/de/LC_MESSAGES/django.po
#	src/utils/locale/de/LC_MESSAGES/django.po
This commit is contained in:
Christian Berg
2018-04-30 08:29:14 +02:00
parent 4aab611026 a2df81d62e
commit 3a3c8ec0c5
60 changed files with 5966 additions and 1455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/events/views.py
View File

@@ -3,7 +3,7 @@ from datetime import timedelta
from django.contrib.auth import get_user_model
from django.contrib.auth.mixins import PermissionRequiredMixin
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.db.models import Q
from django.http import HttpResponse, Http404
from django.shortcuts import redirect