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

ec5af5b8

Commit ec5af5b8 authored 6 years ago by KDSBrowne

Downloads
- Patches
- Plain Diff

fix merge issues

parent 3f521a6f

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

bigbluebutton-html5/imports/ui/components/app/component.jsx 1 addition, 2 deletions

bigbluebutton-html5/imports/ui/components/app/component.jsx
bigbluebutton-html5/imports/ui/components/poll/live-result/styles.scss 9 additions, 9 deletions

...-html5/imports/ui/components/poll/live-result/styles.scss
bigbluebutton-html5/imports/ui/components/poll/styles.scss 28 additions, 28 deletions

bigbluebutton-html5/imports/ui/components/poll/styles.scss
bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-polls/styles.scss 5 additions, 5 deletions

...onents/user-list/user-list-content/user-polls/styles.scss

with 43 additions and 44 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