fix merge conflicts
No related branches found
No related tags found
Showing
- packages/component-admin/index.js 0 additions, 3 deletionspackages/component-admin/index.js
- packages/component-invite/.gitignore 0 additions, 0 deletionspackages/component-invite/.gitignore
- packages/component-invite/README.md 0 additions, 0 deletionspackages/component-invite/README.md
- packages/component-invite/index.js 3 additions, 0 deletionspackages/component-invite/index.js
- packages/component-invite/package.json 2 additions, 2 deletionspackages/component-invite/package.json
- packages/component-invite/src/Invite.js 218 additions, 0 deletionspackages/component-invite/src/Invite.js
- packages/component-mail-service/src/Mail.js 3 additions, 6 deletionspackages/component-mail-service/src/Mail.js
- packages/components-faraday/src/components/Admin/AddEditUser.js 2 additions, 0 deletions...es/components-faraday/src/components/Admin/AddEditUser.js
- packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js 57 additions, 0 deletions...nts-faraday/src/components/SignUp/SignUpInvitationForm.js
- packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js 20 additions, 0 deletions...nts-faraday/src/components/SignUp/SignUpInvitationPage.js
- packages/components-faraday/src/components/SignUp/SignUpStep0.js 87 additions, 0 deletions...s/components-faraday/src/components/SignUp/SignUpStep0.js
- packages/components-faraday/src/components/SignUp/SignUpStep1.js 51 additions, 0 deletions...s/components-faraday/src/components/SignUp/SignUpStep1.js
- packages/xpub-faraday/app/config/journal/index.js 1 addition, 0 deletionspackages/xpub-faraday/app/config/journal/index.js
- packages/xpub-faraday/app/config/journal/title.js 6 additions, 0 deletionspackages/xpub-faraday/app/config/journal/title.js
- packages/xpub-faraday/app/routes.js 2 additions, 0 deletionspackages/xpub-faraday/app/routes.js
- packages/xpub-faraday/config/components.json 1 addition, 1 deletionpackages/xpub-faraday/config/components.json
- packages/xpub-faraday/config/default.js 3 additions, 3 deletionspackages/xpub-faraday/config/default.js
- packages/xpub-faraday/config/validations.js 2 additions, 2 deletionspackages/xpub-faraday/config/validations.js
- packages/xpub-faraday/package.json 3 additions, 2 deletionspackages/xpub-faraday/package.json
Please register or sign in to comment