Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

05edbec1

Commit 05edbec1 authored 4 years ago by Hugo SUBTIL

Downloads
- Plain Diff

Merge branch 'dev' into 'master'

Dev

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

parents 13b99ad0 05a578b7

Branches

Tags

2 merge requests!102Dev,!86Dev

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/app/admin/components/claim-structure/claim-structure.component.ts 10 additions, 6 deletions

...n/components/claim-structure/claim-structure.component.ts
src/app/admin/services/admin.service.ts 20 additions, 4 deletions

src/app/admin/services/admin.service.ts
src/app/structure-list/components/search/search.component.html 1 addition, 1 deletion

...pp/structure-list/components/search/search.component.html
src/app/structure-list/components/search/search.component.scss 0 additions, 1 deletion

...pp/structure-list/components/search/search.component.scss
src/assets/scss/_buttons.scss 1 addition, 1 deletion

src/assets/scss/_buttons.scss
src/styles.scss 3 additions, 0 deletions

src/styles.scss

with 35 additions and 13 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