Merge branch 'master' into snyk-upgrade-037981e3444fec1cda63f4cf3c3627d2

mailchain · Mar 18, 2020 · 7b4e4a7 · 7b4e4a7
2 parents 6653d07 + 3c4c174
commit 7b4e4a7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: ['https://gitcoin.co/grants/153/mailchain-email-like-messaging-and-attachment-capa/fund']
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,8 +31,8 @@
     "popper.js": "^1.16.1",
     "rxjs": "~6.5.4",
     "semver": "^6.3.0",
-    "tslib": "^1.9.0",
     "webpack": "^4.41.6",
+    "tslib": "^1.11.0",
     "zone.js": "~0.10.2"
   },
   "devDependencies": {