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

a636f42e

Commit a636f42e authored 6 years ago by Greg Fodor

Downloads
- Plain Diff

Merge branch 'master' of github.com:mozilla/hubs into feature/presence-users

parents b02c363f a6139f1d

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/assets/images/twitter.svg 3 additions, 0 deletions

src/assets/images/twitter.svg
src/assets/stylesheets/invite-dialog.scss 5 additions, 1 deletion

src/assets/stylesheets/invite-dialog.scss
src/assets/stylesheets/scene-ui.scss 16 additions, 0 deletions

src/assets/stylesheets/scene-ui.scss
src/assets/translations.data.json 2 additions, 0 deletions

src/assets/translations.data.json
src/components/character-controller.js 2 additions, 2 deletions

src/components/character-controller.js
src/react-components/invite-dialog.js 17 additions, 5 deletions

src/react-components/invite-dialog.js
src/react-components/scene-ui.js 12 additions, 0 deletions

src/react-components/scene-ui.js

with 57 additions and 8 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