Merge branch 'org' into tmp_org

aefc18d7 · ibuler · 206e037c · 23815f87 · aefc18d7
Commit aefc18d7 authored Jul 27, 2018 by ibuler
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

urls.py apps/jumpserver/urls.py +0 -1

No files found.
--- a/apps/jumpserver/urls.py
+++ b/apps/jumpserver/urls.py
@@ -83,7 +83,6 @@ urlpatterns = [
    path('api/v1/', redirect_format_api),
    path('api/', include(v1_api_patterns)),

-    # Api url view map
    # External apps url
    path('captcha/', include('captcha.urls')),
 ]