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

34d2c9a3

Commit 34d2c9a3 authored 6 years ago by netpro2k

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into feature/photo-sharing

parents 5e6ba134 96bbe0c6

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/assets/stylesheets/scene-ui.scss 26 additions, 4 deletions

src/assets/stylesheets/scene-ui.scss
src/assets/stylesheets/scene.scss 1 addition, 0 deletions

src/assets/stylesheets/scene.scss
src/hub.js 1 addition, 1 deletion

src/hub.js
src/react-components/create-object-dialog.js 24 additions, 3 deletions

src/react-components/create-object-dialog.js
src/react-components/create-room-dialog.js 18 additions, 10 deletions

src/react-components/create-room-dialog.js
src/react-components/hub-create-panel.js 1 addition, 0 deletions

src/react-components/hub-create-panel.js
src/react-components/scene-ui.js 66 additions, 7 deletions

src/react-components/scene-ui.js
src/scene.js 1 addition, 1 deletion

src/scene.js

with 138 additions and 26 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