fixed conflicts (aeacbc4f) · Commits · xpub / xpub-faraday

Commit aeacbc4f authored 7 years ago by

Sebastian

Browse files

fixed conflicts

parents 4f7cac35 9bc5d9e0

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

packages/component-wizard/package.json 13 additions, 4 deletions

packages/component-wizard/package.json
packages/component-wizard/src/components/AutosaveIndicator.js 46 additions, 24 deletions

...ages/component-wizard/src/components/AutosaveIndicator.js
packages/component-wizard/src/components/AutosaveIndicator.local.scss 0 additions, 66 deletions

...ponent-wizard/src/components/AutosaveIndicator.local.scss
packages/component-wizard/src/components/AutosaveIndicator.md 21 additions, 0 deletions

...ages/component-wizard/src/components/AutosaveIndicator.md
packages/component-wizard/src/components/Wizard.js 11 additions, 4 deletions

packages/component-wizard/src/components/Wizard.js
packages/component-wizard/src/components/Wizard.local.scss 0 additions, 8 deletions

packages/component-wizard/src/components/Wizard.local.scss
packages/component-wizard/src/components/WizardStep.js 55 additions, 13 deletions

packages/component-wizard/src/components/WizardStep.js
packages/component-wizard/src/components/WizardStep.local.scss 0 additions, 44 deletions

...ges/component-wizard/src/components/WizardStep.local.scss
packages/components-faraday/src/components/Admin/AddEditUser.js 81 additions, 0 deletions

...es/components-faraday/src/components/Admin/AddEditUser.js
packages/components-faraday/src/components/Admin/AddUserForm.js 52 additions, 0 deletions

...es/components-faraday/src/components/Admin/AddUserForm.js
packages/components-faraday/src/components/Admin/Admin.js 192 additions, 16 deletions

packages/components-faraday/src/components/Admin/Admin.js
packages/components-faraday/src/components/Admin/Admin.local.scss 0 additions, 6 deletions

.../components-faraday/src/components/Admin/Admin.local.scss
packages/components-faraday/src/components/Admin/AdminPage.js 23 additions, 3 deletions

...ages/components-faraday/src/components/Admin/AdminPage.js
packages/components-faraday/src/components/Admin/EditUserForm.js 78 additions, 0 deletions

...s/components-faraday/src/components/Admin/EditUserForm.js
packages/components-faraday/src/components/Admin/Pagination.js 70 additions, 0 deletions

...ges/components-faraday/src/components/Admin/Pagination.js
packages/components-faraday/src/components/Admin/index.js 1 addition, 0 deletions

packages/components-faraday/src/components/Admin/index.js
packages/components-faraday/src/components/AppBar/AppBar.js 100 additions, 0 deletions

packages/components-faraday/src/components/AppBar/AppBar.js
packages/components-faraday/src/components/Dashboard/Dashboard.js 13 additions, 3 deletions

.../components-faraday/src/components/Dashboard/Dashboard.js
packages/components-faraday/src/components/Dashboard/Dashboard.local.scss 8 additions, 0 deletions

...nts-faraday/src/components/Dashboard/Dashboard.local.scss
packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js 57 additions, 0 deletions

...nts-faraday/src/components/SignUp/SignUpInvitationForm.js

with 821 additions and 191 deletions

Please register or to comment