ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

resolve merge conflicts

Browse source
This commit is contained in:
Tomislav R 2016-05-04 17:36:54 +02:00
commit 52ea4eec49
23 changed files with 393 additions and 834 deletions
Download patch file Download diff file Expand all files Collapse all files

3
digitalglarus/urls.py
View file

@ -5,9 +5,6 @@ from . import views
from .views import ContactView, IndexView, AboutView
urlpatterns = [
# url(r'^$', IndexView.as_view(), name='home'),
# url(_(r'home/?$'), IndexView.as_view(), name='home'),
# url(_(r'about/?$'), AboutView.as_view(), name='about'),
url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
url(_(r'supporters/?$'), views.supporters, name='supporters'),
url(r'calendar_api/(?P<month>\d+)/(?P<year>\d+)?$', views.CalendarApi.as_view(),name='calendar_api_1'),