Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

H

Hubs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

d46286c8

Commit d46286c8 authored 7 years ago by Brian Peiris

Downloads
- Plain Diff

Merge branch 'master' of github.com:mozilla/mr-social-client into...

Merge branch 'master' of github.com:mozilla/mr-social-client into feature/ux-changes-3-with-remount-refactor

parents cdf94cc0 d5052ffd

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

package.json 2 additions, 2 deletions

package.json
src/assets/stylesheets/exited.scss 8 additions, 1 deletion

src/assets/stylesheets/exited.scss
src/assets/stylesheets/index.scss 4 additions, 0 deletions

src/assets/stylesheets/index.scss
src/react-components/home-root.js 10 additions, 0 deletions

src/react-components/home-root.js
src/react-components/ui-root.js 24 additions, 5 deletions

src/react-components/ui-root.js
yarn.lock 10 additions, 6 deletions

yarn.lock

with 58 additions and 14 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