Merge remote-tracking branch 'origin/master' into gh1780

dralley · Apr 11, 2019 · e8b055d · e8b055d
2 parents 65da7e1 + b93ec30
commit e8b055d
Show file tree

Hide file tree

Showing 255 changed files with 3,101 additions and 4,979 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ dist: trusty
 language: rust
 cache: cargo
 rust:
-  - stable
+  - 1.31.1
 branches:
   only:
   - master

diff --git a/2018-edition/nostarch/appendices-d-and-e.md b/2018-edition/nostarch/appendices-d-and-e.md
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ dist: trusty @@
     language: rust
     cache: cargo
     rust:
-      - stable
+      - 1.31.1
     branches:
       only:
       - master
@@ Expand Down @@