diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-08-31 15:11:55 +0800 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-08-31 15:11:55 +0800 |
| commit | 7e36bf448db915250eb831a00b122fc1092df630 (patch) | |
| tree | f3e590a542497efd1908109f752e7a03a8abeca4 /.travis.yml | |
| parent | d78008b546b74d528629b79a7fee00b20f3437e2 (diff) | |
| parent | 03c6a395aa0d32c99e8264d18a3b5228656478df (diff) | |
| download | gitea-7e36bf448db915250eb831a00b122fc1092df630.tar.gz gitea-7e36bf448db915250eb831a00b122fc1092df630.zip | |
Merge branch 'master' of github.com:gogits/gogs into dev
Conflicts:
dockerfiles/README.md
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index dddf5d9d19..2600693b63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,5 @@ language: go go: - 1.2 + - 1.3 - tip
\ No newline at end of file |