chore(merge): merge develop into feature branch (136460ab) · 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.

136460ab

Commit 136460ab authored 6 years ago by

Alexandru Munteanu

Downloads
- Plain Diff

chore(merge): merge develop into feature branch

parents 63ebc9da e8d56eef

No related branches found

No related tags found

2 merge requests!13Sprint #14,!11Submit revision

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

packages/component-wizard/src/redux/conversion.js 2 additions, 0 deletions

packages/component-wizard/src/redux/conversion.js
packages/components-faraday/src/components/Files/Files.js 24 additions, 16 deletions

packages/components-faraday/src/components/Files/Files.js
packages/components-faraday/src/redux/files.js 9 additions, 3 deletions

packages/components-faraday/src/redux/files.js
packages/xpub-faraday/app/config/journal/submit-wizard.js 1 addition, 1 deletion

packages/xpub-faraday/app/config/journal/submit-wizard.js

with 36 additions and 20 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