Merge branch 'master' of https://github.com/go-gitea/gitea

2017-10-12 14:01:36 +02:00 · 2017-10-12 14:01:36 +02:00 · 033ce232df
commit 033ce232df
parent 32f806b3f5 a4cd4616c6
2 changed files with 2 additions and 2 deletions
--- a/integrations/version_test.go
+++ b/integrations/version_test.go
@ -17,7 +17,7 @@ import (
 func TestVersion(t *testing.T) {
 	prepareTestEnv(t)

-	setting.AppVer = "1.1.0+dev"
+	setting.AppVer = "test-version-1"
 	req := NewRequest(t, "GET", "/api/v1/version")
 	resp := MakeRequest(t, req, http.StatusOK)

--- a/main.go
+++ b/main.go
@ -21,7 +21,7 @@ import (
 )

 // Version holds the current Gitea version
-var Version = "1.1.0+dev"
+var Version = "1.3.0-dev"

 // Tags holds the build tags used
 var Tags = ""