Merge branch 'master' into feature/unlocked-cursor
# Conflicts: # src/room.css # src/room.html
No related branches found
No related tags found
Showing
- .babelrc 4 additions, 0 deletions.babelrc
- .eslintrc.json 5 additions, 3 deletions.eslintrc.json
- package.json 17 additions, 2 deletionspackage.json
- src/assets/fonts/zilla-slab_latin-ext.woff2 0 additions, 0 deletionssrc/assets/fonts/zilla-slab_latin-ext.woff2
- src/assets/fonts/zilla-slab_latin.woff2 0 additions, 0 deletionssrc/assets/fonts/zilla-slab_latin.woff2
- src/assets/images/account.svg 14 additions, 0 deletionssrc/assets/images/account.svg
- src/assets/images/daydream_entry.svg 77 additions, 0 deletionssrc/assets/images/daydream_entry.svg
- src/assets/images/desktop_screen_entry.svg 24 additions, 0 deletionssrc/assets/images/desktop_screen_entry.svg
- src/assets/images/gearvr_entry.svg 27 additions, 0 deletionssrc/assets/images/gearvr_entry.svg
- src/assets/images/generic_vr_entry.svg 20 additions, 0 deletionssrc/assets/images/generic_vr_entry.svg
- src/assets/images/level_fill.png 0 additions, 0 deletionssrc/assets/images/level_fill.png
- src/assets/images/level_fill@2x.png 0 additions, 0 deletionssrc/assets/images/level_fill@2x.png
- src/assets/images/mic_denied.png 0 additions, 0 deletionssrc/assets/images/mic_denied.png
- src/assets/images/mic_denied@2x.png 0 additions, 0 deletionssrc/assets/images/mic_denied@2x.png
- src/assets/images/mic_granted.png 0 additions, 0 deletionssrc/assets/images/mic_granted.png
- src/assets/images/mic_granted@2x.png 0 additions, 0 deletionssrc/assets/images/mic_granted@2x.png
- src/assets/images/mic_level.png 0 additions, 0 deletionssrc/assets/images/mic_level.png
- src/assets/images/mic_level@2x.png 0 additions, 0 deletionssrc/assets/images/mic_level@2x.png
- src/assets/images/mic_small.png 0 additions, 0 deletionssrc/assets/images/mic_small.png
- src/assets/images/mic_small@2x.png 0 additions, 0 deletionssrc/assets/images/mic_small@2x.png
Loading
Please register or sign in to comment