Merge branch 'leveling'

[edumed.git] / edumed / urls.py

diff --git a/edumed/urls.py b/edumed/urls.py
index 2c31a0c..fb09204 100644 (file)
--- a/edumed/urls.py
+++ b/edumed/urls.py
@@ -6,14 +6,16 @@ from .views import HomeView, AvatarlessProfileEditView
 
 urlpatterns = patterns('',
     url(r'^$', HomeView.as_view(), name="home"),
 
 urlpatterns = patterns('',
     url(r'^$', HomeView.as_view(), name="home"),

-    url(r'^kompetencje/', include('curriculum.urls')),

     url(r'^lekcje/', include('catalogue.urls')),
     url(r'^info/(?P<url>.*)$', 'django.contrib.flatpages.views.flatpage',
         name="info"),
     url(r'^szukaj/', include('haystack.urls')),
     url(r'^zglos/', include('contact.urls')),
     url(r'^forum/profile/edit/$', AvatarlessProfileEditView.as_view(), name='edit_profile'),
     url(r'^lekcje/', include('catalogue.urls')),
     url(r'^info/(?P<url>.*)$', 'django.contrib.flatpages.views.flatpage',
         name="info"),
     url(r'^szukaj/', include('haystack.urls')),
     url(r'^zglos/', include('contact.urls')),
     url(r'^forum/profile/edit/$', AvatarlessProfileEditView.as_view(), name='edit_profile'),

+    url(r'^forum/', include('forum.urls')),

     url(r'^forum/', include('pybb.urls', namespace='pybb')),
     url(r'^forum/', include('pybb.urls', namespace='pybb')),

+    url(r'^kompetencje/', include('curriculum.urls')),
+    url(r'^wtem/', include('wtem.urls')),

 )
 
 
 )