Unverified Commit d96b35d6 authored by teor's avatar teor
Browse files

Merge branch 'bug32240_32242_035' into bug32240_32242_040

Merge:
* libzstd-dev from ticket32242_035
* shellcheck from maint-0.4.0
parents e2f78396 0b376361
......@@ -115,8 +115,7 @@ addons:
- libnss3-dev
- libscrypt-dev
- libseccomp-dev
## zstd doesn't exist in Ubuntu Trusty
#- libzstd
- libzstd-dev
- shellcheck
## Conditional build dependencies
## Always installed, so we don't need sudo
......
o Testing (continuous integration):
- Use zstd in our Travis Linux builds. Closes ticket 32242.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment