Merge branch 'master' into serialisable

cdimascio · Dec 3, 2019 · a456482 · a456482
2 parents 9df8010 + 90b9600
commit a456482
Show file tree

Hide file tree

Showing 53 changed files with 2,599 additions and 494 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -121,6 +121,15 @@
         "code",
         "test"
       ]
+    },
+    {
+      "login": "rowanc1",
+      "name": "Rowan Cockett",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/913249?v=4",
+      "profile": "http://row1.ca",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,6 @@
+# These are supported funding model platforms
+
+# open_collective: # Replace with a single Open Collective username
+custom: ['https://www.buymeacoffee.com/m97tA5c']
+# github: [CDIMASCIO]
+# patreon: cdimascio
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
@@ -0,0 +1 @@
+🙋 **Looking for help? Reach out on [gitter](https://gitter.im/cdimascio-oss/community)**
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,11 @@ sudo: required
 language: node_js
 node_js:
 - '12'
+- '10'
 before_install:
-- openssl aes-256-cbc -K $encrypted_deba340dfe89_key -iv $encrypted_deba340dfe89_iv
-  -in secrets.zip.enc -out secrets.zip -d
-- unzip secrets.zip
+- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then openssl aes-256-cbc -K $encrypted_deba340dfe89_key -iv $encrypted_deba340dfe89_iv
+  -in secrets.zip.enc -out secrets.zip -d; fi'
+- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then unzip secrets.zip; fi'
 install:
 - npm install
 script: