Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

f687401f

Commit f687401f authored 4 years ago by Romain CREY

Downloads
- Plain Diff

Merge branch 'dev' of https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo into dev

parents d0623e25 73577e04

No related branches found

No related tags found

1 merge request!63merge dev on master - v0.1.8

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

config.json 3 additions, 3 deletions

config.json
src/components/ContentComponents/Charts/Bar.tsx 6 additions, 2 deletions

src/components/ContentComponents/Charts/Bar.tsx
src/components/ContentComponents/Charts/BarChart.tsx 4 additions, 0 deletions

src/components/ContentComponents/Charts/BarChart.tsx
src/components/ContentComponents/Charts/Hash.tsx 36 additions, 4 deletions

src/components/ContentComponents/Charts/Hash.tsx
src/components/ContentComponents/FluidChart/FluidChartSlide.tsx 3 additions, 0 deletions

...mponents/ContentComponents/FluidChart/FluidChartSlide.tsx
src/components/ContentComponents/FluidChart/FluidChartSwipe.tsx 6 additions, 0 deletions

...mponents/ContentComponents/FluidChart/FluidChartSwipe.tsx
src/locales/fr.json 1 addition, 1 deletion

src/locales/fr.json

with 59 additions and 10 deletions

Loading

Romain CREY @ext.sopra.rcrey
mentioned in commit 0a91347e
· 4 years ago

mentioned in commit 0a91347e

mentioned in commit 0a91347e305e309eb03d8bae6cead8468a04e459

Toggle commit list

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