summaryrefslogtreecommitdiffstats
path: root/gogs.go
diff options
context:
space:
mode:
authorevolvedlight <steve@evolvedlight.co.uk>2014-10-13 20:30:31 +0100
committerevolvedlight <steve@evolvedlight.co.uk>2014-10-13 20:30:31 +0100
commit8d2a6fc484b540819e211d52b8d54e97269f0918 (patch)
treee5bfe7d3937bb2d18ba2fb50ea72514bd5bb4e13 /gogs.go
parent29ac3980ffdb5faa525d77fddc109c9023ebe257 (diff)
parent89bd994c836ecc9b6ceb80849f470521e1b15917 (diff)
downloadgitea-8d2a6fc484b540819e211d52b8d54e97269f0918.tar.gz
gitea-8d2a6fc484b540819e211d52b8d54e97269f0918.zip
Merge remote-tracking branch 'upstream/dev'
Conflicts: models/repo.go
Diffstat (limited to 'gogs.go')
-rw-r--r--gogs.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/gogs.go b/gogs.go
index 289ad19123..e0ecec251a 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
-const APP_VER = "0.5.4.1003 Beta"
+const APP_VER = "0.5.5.1013 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())