-
- Downloads
Merge branch 'development' into 'feature/chinmayanand/SearchBar'
# Conflicts: # src/containers/Login/index.jsx
Showing
- package-lock.json 115 additions, 0 deletionspackage-lock.json
- package.json 5 additions, 0 deletionspackage.json
- public/index.html 2 additions, 0 deletionspublic/index.html
- src/App.js 15 additions, 2 deletionssrc/App.js
- src/components/Button/Button.module.scss 4 additions, 2 deletionssrc/components/Button/Button.module.scss
- src/components/Button/index.jsx 2 additions, 2 deletionssrc/components/Button/index.jsx
- src/components/Image/Image.scss 6 additions, 0 deletionssrc/components/Image/Image.scss
- src/components/Image/index.jsx 21 additions, 0 deletionssrc/components/Image/index.jsx
- src/components/Social_buttons/Index.jsx 14 additions, 0 deletionssrc/components/Social_buttons/Index.jsx
- src/components/Social_buttons/Social_buttons.module.scss 19 additions, 0 deletionssrc/components/Social_buttons/Social_buttons.module.scss
- src/containers/Login/index.jsx 10 additions, 4 deletionssrc/containers/Login/index.jsx
- src/index.js 3 additions, 0 deletionssrc/index.js
Loading
Please register or sign in to comment