Merge branch 'develop' into panel-title-menu-ux

2017-08-02 09:56:08 +02:00
parent e312408855 ebcbcdc27a
commit 9fb60c2fc8
116 changed files with 5196 additions and 1071 deletions
@@ -219,7 +219,7 @@ func SearchUsers(c *middleware.Context) Response {
 	return Json(200, query.Result.Users)
 }

-// GET /api/search
+// GET /api/users/search
 func SearchUsersWithPaging(c *middleware.Context) Response {
 	query, err := searchUser(c)
 	if err != nil {