Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

7a092941

Commit 7a092941 authored 4 years ago by Hugo NOUTS

Downloads
- Plain Diff

Merge branch 'dev' of...

Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into features/US135-CTA-enedis-activation

parents cac45d28 f9437b20

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/assets/anims/splash.json 1 addition, 1 deletion

src/assets/anims/splash.json
src/components/ContainerComponents/SplashContainer/SplashContainer.tsx 2 additions, 2 deletions

...s/ContainerComponents/SplashContainer/SplashContainer.tsx
src/components/ContentComponents/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx 8 additions, 3 deletions

...s/ConsumptionVisualizer/DataloadConsumptionVisualizer.tsx

with 11 additions and 6 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