summaryrefslogtreecommitdiff
path: root/workshop_portal
diff options
context:
space:
mode:
authoradityacp2020-07-21 14:33:10 +0530
committeradityacp2020-07-21 14:33:10 +0530
commit120ff8c5e6a90c5c02af7f9266e1fd9a6435350f (patch)
treed758293ba442cffa3930aea081e4fd63ed34d00d /workshop_portal
parent5b593457c0d07a6c11884c33ec7c676de9510b9d (diff)
parent9dad3388d07af45c885fbe5b713294a19d7d6b2e (diff)
downloadworkshop_booking-120ff8c5e6a90c5c02af7f9266e1fd9a6435350f.tar.gz
workshop_booking-120ff8c5e6a90c5c02af7f9266e1fd9a6435350f.tar.bz2
workshop_booking-120ff8c5e6a90c5c02af7f9266e1fd9a6435350f.zip
Get latest changes and resolve conflicts
Diffstat (limited to 'workshop_portal')
-rw-r--r--workshop_portal/settings.py1
-rw-r--r--workshop_portal/urls.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/workshop_portal/settings.py b/workshop_portal/settings.py
index abf58f5..ad727af 100644
--- a/workshop_portal/settings.py
+++ b/workshop_portal/settings.py
@@ -47,6 +47,7 @@ INSTALLED_APPS = [
'workshop_app',
'statistics_app',
'teams',
+ 'cms',
]
MIDDLEWARE = [
diff --git a/workshop_portal/urls.py b/workshop_portal/urls.py
index 464b98c..703a9ed 100644
--- a/workshop_portal/urls.py
+++ b/workshop_portal/urls.py
@@ -21,4 +21,5 @@ urlpatterns = [
url(r'^admin/', admin.site.urls),
url(r'^', include('workshop_app.urls')),
url(r'^reset/', include('django.contrib.auth.urls')),
+ url(r'^', include('cms.urls')),
]