diff options
| author | Michael Boke <michael@mbict.nl> | 2014-10-03 22:51:07 +0200 |
|---|---|---|
| committer | Michael Boke <michael@mbict.nl> | 2014-10-03 22:51:07 +0200 |
| commit | ba1270df2d3d835b397317f133963e7b517242f1 (patch) | |
| tree | 1265a142a1fd9951d30ae11648e7fbfb5806e594 /.travis.yml | |
| parent | ba0feadc34400cb91ff23f66096884d862651cdd (diff) | |
| parent | 405ee14711ab946bd709ec28a526890c40cbc03b (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
conf/app.ini
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 2600693b..eb5732ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,5 +2,4 @@ language: go go: - 1.2 - - 1.3 - - tip
\ No newline at end of file + - 1.3
\ No newline at end of file |