Merge branch 'master' into master

gin-gonic · Jun 17, 2020 · 90ac8b4 · 90ac8b4
2 parents 7c501d5 + 5e40c1d
commit 90ac8b4
Show file tree

Hide file tree

Showing 36 changed files with 1,580 additions and 1,144 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,7 @@
 - With pull requests:
   - Open your pull request against `master`
   - Your pull request should have no more than two commits, if not you should squash them.
-  - It should pass all tests in the available continuous integrations systems such as TravisCI.
+  - It should pass all tests in the available continuous integration systems such as TravisCI.
   - You should add/modify tests to cover your proposed code changes.
   - If your pull request contains a new feature, please document it on the README.
 
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,10 @@ matrix:
   - go: 1.13.x
     env: 
       - TESTTAGS=nomsgpack
+  - go: 1.14.x
+  - go: 1.14.x
+    env:
+      - TESTTAGS=nomsgpack
   - go: master
 
 git: