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

Conflicts: dockerfiles/README.md
2014-08-31 15:11:55 +08:00
parent d78008b546 03c6a395aa
commit 7e36bf448d
7 changed files with 47 additions and 7 deletions
@@ -2,4 +2,5 @@ language: go

 go:
  - 1.2
+  - 1.3
  - tip