Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

5776091e

Commit 5776091e authored 5 years ago by Gauthier LEFEVRE

Downloads
- Plain Diff

Merge branch 'dev' of...

Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into fix-issues-22-et-1-syntaxe-et-date-fausse

parents 8448990b 468bb016

Branches

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/components/ContainerComponents/ViewContainer/HomeViewContainer.tsx 3 additions, 1 deletion

...s/ContainerComponents/ViewContainer/HomeViewContainer.tsx
src/components/ContainerComponents/ViewContainer/SingleFluidViewContainer.tsx 3 additions, 1 deletion

...inerComponents/ViewContainer/SingleFluidViewContainer.tsx
src/components/ContentComponents/Challenge/FollowChallengeTimeline.tsx 21 additions, 11 deletions

...s/ContentComponents/Challenge/FollowChallengeTimeline.tsx
src/components/ContentComponents/EcogestureModal/EcogestureModal.tsx 1 addition, 1 deletion

...nts/ContentComponents/EcogestureModal/EcogestureModal.tsx
src/services/triggersService.ts 1 addition, 1 deletion

src/services/triggersService.ts

with 29 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