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

Conflicts:
	models/oauth2.go
This commit is contained in:
Unknown 2014-04-09 14:15:09 -04:00
commit 5f6bd323f5
9 changed files with 260 additions and 24 deletions

View file

@ -19,7 +19,7 @@ import (
// Test that go1.2 tag above is included in builds. main.go refers to this definition.
const go12tag = true
const APP_VER = "0.2.2.0408 Alpha"
const APP_VER = "0.2.2.0409 Alpha"
func init() {
base.AppVer = APP_VER