Merge branch 'dev' of github.com:gogits/gogs into dev

1 files changed, 5 insertions, 0 deletions

diff --git a/cmd/web.go b/cmd/web.go
index 30db037a..2b14b077 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -27,6 +27,7 @@ import (
 	"github.com/gogits/gogs/routers/admin"
 	"github.com/gogits/gogs/routers/api/v1"
 	"github.com/gogits/gogs/routers/dev"
+	"github.com/gogits/gogs/routers/org"
 	"github.com/gogits/gogs/routers/repo"
 	"github.com/gogits/gogs/routers/user"
 )
@@ -186,6 +187,10 @@ func runWeb(*cli.Context) {
 
 	reqOwner := middleware.RequireOwner()
 
+	m.Group("/o", func(r martini.Router) {
+		r.Get("/:org", org.Organization)
+	})
+
 	m.Group("/:username/:reponame", func(r martini.Router) {
 		r.Get("/settings", repo.Setting)
 		r.Post("/settings", bindIgnErr(auth.RepoSettingForm{}), repo.SettingPost)