Merge branch 'faraday-master' of gitlab.coko.foundation:xpub/xpub into faraday-master (b16375e0) · Commits · xpub / xpub-faraday · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xpub-faraday
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Container Registry
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

b16375e0

Commit b16375e0 authored 7 years ago by

Sebastian

Downloads
- Plain Diff

Merge branch 'faraday-master' of gitlab.coko.foundation:xpub/xpub into faraday-master

parents 6a42fb1f 9cc64b15

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

packages/components-faraday/src/components/Admin/AddEditUser.js 11 additions, 1 deletion

...es/components-faraday/src/components/Admin/AddEditUser.js
packages/components-faraday/src/components/Admin/Admin.js 96 additions, 96 deletions

packages/components-faraday/src/components/Admin/Admin.js
packages/components-faraday/src/components/Admin/AdminDashboard.js 76 additions, 0 deletions

...components-faraday/src/components/Admin/AdminDashboard.js
packages/components-faraday/src/components/Admin/index.js 2 additions, 3 deletions

packages/components-faraday/src/components/Admin/index.js
packages/components-faraday/src/components/AppBar/AppBar.js 3 additions, 1 deletion

packages/components-faraday/src/components/AppBar/AppBar.js
packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js 16 additions, 5 deletions

...nts-faraday/src/components/SignUp/SignUpInvitationPage.js
packages/components-faraday/src/components/UIComponents/Logo.js 4 additions, 2 deletions

...es/components-faraday/src/components/UIComponents/Logo.js
packages/xpub-faraday/app/FaradayApp.js 1 addition, 10 deletions

packages/xpub-faraday/app/FaradayApp.js
packages/xpub-faraday/app/routes.js 7 additions, 3 deletions

packages/xpub-faraday/app/routes.js
packages/xpub-faraday/config/default.js 1 addition, 1 deletion

packages/xpub-faraday/config/default.js
packages/xpub-faraday/package.json 0 additions, 1 deletion

packages/xpub-faraday/package.json

with 217 additions and 123 deletions

0% 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