Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Ecolyo
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

e93aa3e1

Commit e93aa3e1 authored 4 years ago by Romain CREY

Downloads
- Plain Diff

Merge branch 'dev' into features/US162-feedback-MVP

parents b9c12caa 8f8474f5

Branches

Tags

2 merge requests!50Merge dev into master,!41Features/us162 buttons order + color + locked challenge logo

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

docker/cozy-app-dev-with-app.sh 12 additions, 12 deletions

docker/cozy-app-dev-with-app.sh
manifest.webapp 1 addition, 1 deletion

manifest.webapp
package.json 1 addition, 1 deletion

package.json
src/components/CommonKit/Card/StyledCard.tsx 1 addition, 1 deletion

src/components/CommonKit/Card/StyledCard.tsx
test/data/accountData.json 38 additions, 0 deletions

test/data/accountData.json
test/importAccount.bat 4 additions, 0 deletions

test/importAccount.bat

with 57 additions and 15 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