Merge branch 'forum' into 'master'

Forum

See merge request !49
This commit is contained in:
Skia committed 2017-02-24 03:08:07 +01:00
commit 59dfcbd567
38 files changed
+1171 -59

No files matched your search

+1
View File
@@ -40,6 +40,7 @@ urlpatterns = [
url(r'^sas/', include('sas.urls', namespace="sas", app_name="sas")),
url(r'^api/v1/', include('api.urls', namespace="api", app_name="api")),
url(r'^election/', include('election.urls', namespace="election", app_name="election")),
url(r'^forum/', include('forum.urls', namespace="forum", app_name="forum")),
url(r'^admin/', include(admin.site.urls)),
url(r'^ajax_select/', include(ajax_select_urls)),
url(r'^i18n/', include('django.conf.urls.i18n')),