Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

sp-19-cs242-assignment3
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

d39bddaf

Commit d39bddaf authored 5 years ago by Shreya Sharma

Downloads
- Patches
- Plain Diff

Merge branch 'master' into 'assignment-3.1'

# Conflicts:
#   App.js

parent 6e9c2d02

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

App.js 2 additions, 2 deletions

App.js
react_components/helper_components/ContentBlock.js 0 additions, 0 deletions

react_components/helper_components/ContentBlock.js
react_components/helper_components/ProfilePicture.js 0 additions, 0 deletions

react_components/helper_components/ProfilePicture.js
react_components/helper_components/UserBlock.js 0 additions, 0 deletions

react_components/helper_components/UserBlock.js
react_components/page_components/Followers.js 1 addition, 1 deletion

react_components/page_components/Followers.js
react_components/page_components/Following.js 1 addition, 1 deletion

react_components/page_components/Following.js
react_components/page_components/Profile.js 5 additions, 5 deletions

react_components/page_components/Profile.js
react_components/page_components/Repositories.js 1 addition, 1 deletion

react_components/page_components/Repositories.js

with 10 additions and 10 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