Merge branch 'master' of github.com:gogits/gogs

Conflicts:
	routers/repo/single.go

1 files changed, 2 insertions, 2 deletions

diff --git a/web.go b/web.go
index f793518a..ceb193e6 100644
--- a/web.go
+++ b/web.go
@@ -107,9 +107,9 @@ func runWeb(*cli.Context) {
 	m.Get("/:username/:reponame/pulls", ignSignIn, middleware.RepoAssignment(true), repo.Pulls)
 	m.Get("/:username/:reponame/branches", ignSignIn, middleware.RepoAssignment(true), repo.Branches)
 	m.Get("/:username/:reponame/action/:action", reqSignIn, middleware.RepoAssignment(true), repo.Action)
-	m.Get("/:username/:reponame/tree/:branchname/**",
+	m.Get("/:username/:reponame/src/:branchname/**",
 		ignSignIn, middleware.RepoAssignment(true), repo.Single)
-	m.Get("/:username/:reponame/tree/:branchname",
+	m.Get("/:username/:reponame/src/:branchname",
 		ignSignIn, middleware.RepoAssignment(true), repo.Single)
 	m.Get("/:username/:reponame/commit/:commitid/**", ignSignIn, middleware.RepoAssignment(true), repo.Single)
 	m.Get("/:username/:reponame/commit/:commitid", ignSignIn, middleware.RepoAssignment(true), repo.Single)