Merge branch 'upstream' into input

This commit is contained in:
Cameron Hart 2016-06-05 10:12:49 +10:00
commit ad943962e5

View File

@ -3,6 +3,7 @@ rust:
- stable
- beta
- nightly
cache: cargo
matrix:
allow_failures:
- rust: nightly