Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

7c1c0f81

Commit 7c1c0f81 authored 4 years ago by Romain CREY

Downloads
- Plain Diff

Merge branch 'dev' into features/US142-random-ecogestures

parents a3aea298 6ac5d8b7

No related branches found

No related tags found

Loading

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

config.json 2 additions, 2 deletions

config.json
package.json 0 additions, 1 deletion

package.json
src/components/ContentComponents/FAQ/FAQ.tsx 51 additions, 5 deletions

src/components/ContentComponents/FAQ/FAQ.tsx
src/db/FAQ.json 63 additions, 35 deletions

src/db/FAQ.json
src/styles/components/_faq.scss 13 additions, 3 deletions

src/styles/components/_faq.scss
src/styles/index.css 570 additions, 396 deletions

src/styles/index.css

with 699 additions and 442 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