Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

sample_Argon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

eb130207

Commit eb130207 authored Jan 7, 2022 by Nipa Das

Downloads
- Plain Diff

Merge branch 'development' into 'features/ashok/social_buttons'

# Conflicts:
#   src/App.js
#   src/components/Button/Button.module.scss
#   src/components/Button/index.jsx
#   src/containers/Login/index.jsx

parents 5d4835fc b0fa8994

Branches

No related tags found

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

package-lock.json 63 additions, 0 deletions

package-lock.json
package.json 3 additions, 0 deletions

package.json
src/App.js 17 additions, 12 deletions

src/App.js
src/components/Button/Button.module.scss 4 additions, 18 deletions

src/components/Button/Button.module.scss
src/components/Button/index.jsx 3 additions, 6 deletions

src/components/Button/index.jsx
src/components/Image/Image.scss 6 additions, 0 deletions

src/components/Image/Image.scss
src/components/Image/index.jsx 21 additions, 0 deletions

src/components/Image/index.jsx
src/containers/Login/index.jsx 10 additions, 11 deletions

src/containers/Login/index.jsx
src/index.js 3 additions, 0 deletions

src/index.js

with 130 additions and 47 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment