Merge branch 'master' into 1509-fix-png-images-files-endpoint

onaio · Jan 5, 2019 · 39a3567 · 39a3567
2 parents 0017e9c + a25e45d
commit 39a3567
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/onadata/apps/api/urls.py b/onadata/apps/api/urls.py
@@ -4,7 +4,6 @@
 """
 from django.conf.urls import url
 from django.contrib import admin
-
 from rest_framework import routers
 from rest_framework.urlpatterns import format_suffix_patterns
 
@@ -148,5 +147,5 @@ def get_urls(self):
     r'submissions', XFormSubmissionViewSet, base_name='submissions')
 router.register(r'teams', TeamViewSet)
 router.register(r'user', ConnectViewSet)
-router.register(r'users', UserViewSet)
+router.register(r'users', UserViewSet, base_name='user')
 router.register(r'widgets', WidgetViewSet, base_name='widgets')