mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Merge branch 'master' into stable

Browse source
This commit is contained in:
Tomas "Jethro" Pokorny 2016-09-29 11:09:16 +02:00
commit 63ec8cbbc7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
seminar/urls.py
View file

@ -10,8 +10,8 @@ staff_member_required = user_passes_test(lambda u: u.is_staff)
urlpatterns = [ urlpatterns = [
# prednasky # prednasky
#url(r'^prednasky/$', newPrednaska), url(r'^prednasky/$', newPrednaska),
#url(r'^prednasky/hotovo$', Prednaska_hotovo), url(r'^prednasky/hotovo$', Prednaska_hotovo),
# REDIRECTy # REDIRECTy
url(r'^jak-resit/$', RedirectView.as_view(url='/co-je-MaM/jak-resit/')), url(r'^jak-resit/$', RedirectView.as_view(url='/co-je-MaM/jak-resit/')),