Skip to content
This repository has been archived by the owner on Apr 4, 2022. It is now read-only.

chore: Merge patching and updates from Staging #198

Merged
merged 27 commits into from
Jul 6, 2020
Merged

chore: Merge patching and updates from Staging #198

merged 27 commits into from
Jul 6, 2020

Conversation

tboeckmann
Copy link
Member

No description provided.

snyk-bot and others added 27 commits May 14, 2020 01:02
…ging

* snyk-upgrade-d7b96dcb56a4ae5c04e08bc44091967b:
  fix: upgrade jquery from 3.5.0 to 3.5.1
  fix: upgrade jquery from 3.5.0 to 3.5.1
…ging

* snyk-upgrade-f846670687e65722503db247b9eef067:
  fix: upgrade tslib from 1.11.1 to 1.11.2
  fix: upgrade tslib from 1.11.1 to 1.11.2

# Conflicts:
#	package.json
* commit '338e3b9ca7023c148310922aa23d380658da12ea':
  fix: upgrade bootstrap from 4.4.1 to 4.5.0
* commit '9921d8b3412ace5312f7c24d7161de45712f5245':
  Bump websocket-extensions from 0.1.3 to 0.1.4
…ging

* 'staging' of github.com:mailchain/mailchain-web:
  update karma-jasmine
* commit '391707884e2a175ded3707ab9b8393053fc241e1':
  fix: upgrade tslib from 1.11.1 to 1.13.0

# Conflicts:
#	package-lock.json
#	package.json
@tboeckmann tboeckmann merged commit 648cdc8 into master Jul 6, 2020
@tboeckmann tboeckmann deleted the staging branch July 6, 2020 01:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants