Merge branch 'hotfix-react-scripts' into develop

auto_join_3.3
Håvar Aambø Fosstveit 2020-03-31 12:39:42 +02:00
commit 160a510f8e
2 changed files with 3 additions and 7 deletions

View File

@ -1,6 +1,6 @@
{
"name": "multiparty-meeting",
"version": "3.1.0",
"version": "3.2.0",
"private": true,
"description": "multiparty meeting service",
"author": "Håvar Aambø Fosstveit <h@fosstveit.net>",
@ -28,7 +28,7 @@
"react-intl": "^3.4.0",
"react-redux": "^7.1.1",
"react-router-dom": "^5.1.2",
"react-scripts": "^3.3.0",
"react-scripts": "3.0.1",
"redux": "^4.0.4",
"redux-logger": "^3.0.6",
"redux-persist": "^6.0.0",
@ -57,11 +57,7 @@
],
"devDependencies": {
"electron": "^7.1.1",
"eslint": "^6.5.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-react": "^7.16.0",
"foreman": "^3.0.1",
"jest": "^24.9.0",
"redux-mock-store": "^1.5.3"
}
}

View File

@ -1,6 +1,6 @@
{
"name": "multiparty-meeting-server",
"version": "3.1.0",
"version": "3.2.0",
"private": true,
"description": "multiparty meeting server",
"author": "Håvar Aambø Fosstveit <h@fosstveit.net>",