summaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorFuXiaoHei <fuxiaohei@hexiaz.com>2014-03-24 21:27:28 +0800
committerFuXiaoHei <fuxiaohei@hexiaz.com>2014-03-24 21:27:28 +0800
commit98ec6a4eaa274fac196e6e5273517db3fcf45e84 (patch)
tree2e4f0b1dbcf0cb097ac749ee72db18bd0d550fc6 /routers
parent5e22f1437ac2466d599c242fd5e256180fa7b68e (diff)
parentae92f92dee9007d1bef2db19331d9ee8f9883778 (diff)
downloadgitea-98ec6a4eaa274fac196e6e5273517db3fcf45e84.tar.gz
gitea-98ec6a4eaa274fac196e6e5273517db3fcf45e84.zip
Merge branch 'master' of https://github.com/gogits/gogs
Diffstat (limited to 'routers')
-rw-r--r--routers/repo/pull.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index d4a12a4a83..16c60389da 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -6,6 +6,7 @@ package repo
import (
"github.com/codegangsta/martini"
+
"github.com/gogits/gogs/modules/middleware"
)