Skip to content

Commit 2f03e11

shah-dhaval shah-dhaval

committed

Merge branch 'master' of https://github.com/rmemon/react-redux-admin-panel

2 parents f611dee + a144edf commit 2f03e11Copy full SHA for 2f03e11

File tree

14 files changed

+1157

-3

lines changed

.vscode
- settings.json
package-lock.json
package.json
src/containers/App/Backend
- Access/Permissions
- Routes
  - _nav.js
  - routes.js
- backendCommonReducer.js

14 files changed

+1157

-3

lines changed

`‎.vscode/settings.json`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+{`
	`2`	`+}`

`‎package-lock.json`

Lines changed: 272 additions & 2 deletions

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

`‎package.json`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`"dev": "^0.1.3",`
`16`	`16`	`"enzyme": "^3.3.0",`
`17`	`17`	`"enzyme-adapter-react-16": "^1.1.1",`
	`18`	`+ "eslint": "^5.1.0",`
`18`	`19`	`"flag-icon-css": "^3.0.0",`
`19`	`20`	`"font-awesome": "^4.7.0",`
`20`	`21`	`"hoist-non-react-statics": "^2.5.5",`

0 commit comments

Comments

(0)