watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/dev' into dev

Browse source 
# Conflicts:
#	yarn.lock
This commit is contained in:
Mike Cao 2021-03-26 17:09:30 -07:00
commit f9bf6aff2e
4 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -64,6 +64,7 @@
"classnames": "^2.2.6",
"cookie": "^0.4.1",
"cors": "^2.8.5",
"datamaps": "^0.5.9",
"date-fns": "^2.16.1",
"date-fns-tz": "^1.0.12",
"detect-browser": "^5.2.0",