Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281

Conflicts:
	modules/base/tool.go

1 files changed, 3 insertions, 2 deletions

diff --git a/routers/api/v1/users.go b/routers/api/v1/users.go
index e4da60aa..fe670337 100644
--- a/routers/api/v1/users.go
+++ b/routers/api/v1/users.go
@@ -5,8 +5,9 @@
 package v1
 
 import (
+	"github.com/Unknwon/com"
+
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/middleware"
 )
 
@@ -17,7 +18,7 @@ type user struct {
 
 func SearchUsers(ctx *middleware.Context) {
 	q := ctx.Query("q")
-	limit, err := base.StrTo(ctx.Query("limit")).Int()
+	limit, err := com.StrTo(ctx.Query("limit")).Int()
 	if err != nil {
 		limit = 10
 	}