Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

fairblue
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents
- Service Desk

Snippets Groups Projects

aa154e5b

Commit aa154e5b authored 8 years ago by Oswaldo Acauan

Downloads
- Patches
- Plain Diff

Merge after git conflict/lost object

parent 1c0132ed

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-html5/imports/ui/components/loader/component.jsx 17 additions, 0 deletions

...uebutton-html5/imports/ui/components/loader/component.jsx
bigbluebutton-html5/imports/ui/components/loader/styles.scss 60 additions, 0 deletions

bigbluebutton-html5/imports/ui/components/loader/styles.scss
bigbluebutton-html5/imports/ui/components/polling/styles.scss 29 additions, 0 deletions

...luebutton-html5/imports/ui/components/polling/styles.scss

with 106 additions and 0 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

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net