Merge branch 'master' into simon/angular-universal

* master:
  Add the Commons Clause License Condition v1.0 to our MIT License
  fix legend bug on resize
  Correcting new chartist import path.
  Flip mempool chart by using patched chartist package by @techmix

# Conflicts:
#	frontend/package-lock.json
This commit is contained in:
softsimon
2020-11-15 02:51:00 +07:00
8 changed files with 31 additions and 22 deletions

View File

@@ -50,11 +50,11 @@
"@fortawesome/fontawesome-common-types": "^0.2.30",
"@fortawesome/fontawesome-svg-core": "^1.2.30",
"@fortawesome/free-solid-svg-icons": "^5.14.0",
"@mempool/chartist": "^0.11.4",
"@ng-bootstrap/ng-bootstrap": "^7.0.0",
"@nguniversal/express-engine": "10.1.0",
"@types/qrcode": "^1.3.4",
"bootstrap": "4.5.0",
"chartist": "^0.11.4",
"clipboard": "^2.0.4",
"domino": "^2.1.6",
"express": "^4.15.2",