diff options
| author | Meaglith Ma <genedna@gmail.com> | 2014-03-31 17:23:37 +0800 |
|---|---|---|
| committer | Meaglith Ma <genedna@gmail.com> | 2014-03-31 17:23:37 +0800 |
| commit | 1a247340dbea3404431f60a24bb8f8d06d94b1e9 (patch) | |
| tree | 80d3ecab43506e03405c742a84dcc61f474e2212 /routers/repo/pull.go | |
| parent | 9047cadcd33f95eebafa2f794b895c8406eb80c5 (diff) | |
| parent | dd9fb807a46db120ef800d7465f50a73a86df288 (diff) | |
Merge pull request #1 from gogits/master
Sync to lastest
Diffstat (limited to 'routers/repo/pull.go')
| -rw-r--r-- | routers/repo/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 93b6a9f7..430c6a81 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -5,7 +5,7 @@ package repo import ( - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gogits/gogs/modules/middleware" ) |