Add the merge user function

This commit is contained in:
Skia
2016-09-21 14:09:16 +02:00
parent f1e54439e1
commit 9e4e9597d1
15 changed files with 249 additions and 99 deletions

View File

@ -54,6 +54,7 @@ INSTALLED_APPS = (
'eboutic',
'launderette',
'api',
'rootplace',
)
MIDDLEWARE_CLASSES = (

View File

@ -29,6 +29,7 @@ handler404 = "core.views.not_found"
urlpatterns = [
url(r'^', include('core.urls', namespace="core", app_name="core")),
url(r'^rootplace/', include('rootplace.urls', namespace="rootplace", app_name="rootplace")),
url(r'^subscription/', include('subscription.urls', namespace="subscription", app_name="subscription")),
url(r'^club/', include('club.urls', namespace="club", app_name="club")),
url(r'^counter/', include('counter.urls', namespace="counter", app_name="counter")),