Merge branch 'master' into stable

This commit is contained in:
Bc. Petr Pecha 2015-10-07 20:23:58 +02:00
commit e0a4afccbb

View file

@ -1,7 +1,7 @@
from datetime import datetime, date from datetime import datetime, date
from django.conf import settings from django.conf import settings
from django.http import HttpResponse, HttpResponseRedirect from django.http import HttpResponse, HttpResponseRedirect, HttpRequest