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

Conflicts:
	conf/app.ini

1 files changed, 13 insertions, 0 deletions

diff --git a/routers/install.go b/routers/install.go
new file mode 100644
index 00000000..d7d5159e
--- /dev/null
+++ b/routers/install.go
@@ -0,0 +1,13 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package routers
+
+import "github.com/gogits/gogs/modules/middleware"
+
+func Install(ctx *middleware.Context){
+	ctx.Data["PageIsInstall"] = true
+	ctx.Data["Title"] = "Install"
+	ctx.HTML(200,"install")
+}