diff options
| author | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:12:17 +0200 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-09-28 09:12:17 +0200 |
| commit | 9330ea1f4d34b6ef4ce6e841f1aa931a7f10f749 (patch) | |
| tree | 81e346b3d9ca532b3d252135d82ce20f61780a36 /.travis.yml | |
| parent | 06e299cef591b63bd96f320eadc873b047cd2664 (diff) | |
| parent | 4aea3f88a6d30f102a79c2da7fcfac96465ba1a8 (diff) | |
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index d5b51fcb0..52ff15c01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,18 +26,16 @@ addons: postgresql: 9.4 apt: sources: - - ubuntu-toolchain-r-test - trusty-media packages: - ffmpeg - - g++-6 - libprotobuf-dev - protobuf-compiler - libicu-dev rvm: - 2.3.4 - - 2.4.1 + - 2.4.2 services: - redis-server |