Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

1928104e

Commit 1928104e authored 4 years ago by Hugo SUBTIL

Downloads
- Plain Diff

Merge branch 'dev' into 'recette'

Dev

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client!33

parents d6b94d81 ae674080

No related branches found

No related tags found

2 merge requests!35Recette,!33Dev

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 25 additions, 0 deletions

.gitlab-ci.yml
src/app/home/home.component.html 1 addition, 0 deletions

src/app/home/home.component.html
src/app/map/components/map.component.ts 10 additions, 2 deletions

src/app/map/components/map.component.ts
src/app/structure-list/components/modal-filter/modal-filter.component.scss 4 additions, 3 deletions

...-list/components/modal-filter/modal-filter.component.scss
src/app/structure-list/components/structure-details/structure-details.component.scss 3 additions, 2 deletions

...onents/structure-details/structure-details.component.scss
src/styles.scss 8 additions, 1 deletion

src/styles.scss

with 51 additions and 8 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