Merge branch 'dev' into hohoTT-dev

This commit is contained in:
hohoTT 2015-08-10 15:22:47 +08:00
commit b45a79a65b

10
admin/test_urls.py Normal file
View File

@ -0,0 +1,10 @@
# coding=utf-8
from django.conf.urls import include, url
from django.views.generic import TemplateView
urlpatterns = [
url(r'^admin/$', TemplateView.as_view(template_name="admin/admin.html"), name="admin_spa_page"),
url(r'^api/admin/test/$', "admin.tests.middleware_test_func"),
url(r'^login/$', TemplateView.as_view(template_name="oj/account/login.html"), name="user_login_page"),
]