Merge branch 'master' into stable
This commit is contained in:
commit
63ec8cbbc7
1 changed files with 2 additions and 2 deletions
|
@ -10,8 +10,8 @@ staff_member_required = user_passes_test(lambda u: u.is_staff)
|
|||
|
||||
urlpatterns = [
|
||||
# prednasky
|
||||
#url(r'^prednasky/$', newPrednaska),
|
||||
#url(r'^prednasky/hotovo$', Prednaska_hotovo),
|
||||
url(r'^prednasky/$', newPrednaska),
|
||||
url(r'^prednasky/hotovo$', Prednaska_hotovo),
|
||||
|
||||
# REDIRECTy
|
||||
url(r'^jak-resit/$', RedirectView.as_view(url='/co-je-MaM/jak-resit/')),
|
||||
|
|
Loading…
Reference in a new issue