Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/crupest/Timeline
Browse files Browse the repository at this point in the history
  • Loading branch information
crupest committed Jun 3, 2021
2 parents cd0fda5 + 288f77c commit eb3c42b
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 61 deletions.
95 changes: 38 additions & 57 deletions FrontEnd/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions FrontEnd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"lodash": "^4.17.21",
"pepjs": "^0.5.3",
"react": "^17.0.1",
"react-bootstrap": "^2.0.0-alpha.2",
"react-bootstrap": "^2.0.0-beta.0",
"react-color": "^2.19.3",
"react-dom": "^17.0.2",
"react-i18next": "^11.10.0",
Expand Down Expand Up @@ -60,15 +60,15 @@
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.0-beta.9",
"@types/color": "^3.0.1",
"@types/lodash": "^4.14.170",
"@types/node": "^15.6.1",
"@types/node": "^15.9.0",
"@types/react": "^17.0.9",
"@types/react-color": "^3.0.4",
"@types/react-dom": "^17.0.6",
"@types/react-responsive": "^8.0.2",
"@types/react-router": "^5.1.13",
"@types/react-router-bootstrap": "^0.24.5",
"@types/react-router-dom": "^5.1.7",
"@types/remarkable": "^2.0.1",
"@types/remarkable": "^2.0.2",
"@types/webpack-env": "^1.16.0",
"@types/xregexp": "^4.4.0",
"@typescript-eslint/eslint-plugin": "^4.26.0",
Expand All @@ -90,7 +90,7 @@
"prettier": "^2.3.0",
"react-refresh": "^0.10.0",
"react-refresh-typescript": "^2.0.1",
"sass": "^1.34.0",
"sass": "^1.34.1",
"sass-loader": "^12.0.0",
"style-loader": "^2.0.0",
"ts-loader": "^9.2.2",
Expand Down

0 comments on commit eb3c42b

Please sign in to comment.