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

23e6826b

Commit 23e6826b authored 7 years ago by Brian Peiris

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/feature/initial-react-ui' into feature/react-name-entry

parents 9b59df4d f4721912

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

package.json 3 additions, 2 deletions

package.json
src/react-components/ui-root.js 85 additions, 8 deletions

src/react-components/ui-root.js
src/room.js 22 additions, 4 deletions

src/room.js
src/utils/concurrent-load-detector.js 44 additions, 0 deletions

src/utils/concurrent-load-detector.js
yarn.lock 11 additions, 7 deletions

yarn.lock

with 165 additions and 21 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