Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Server
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

e57ed8a5

Commit e57ed8a5 authored 3 years ago by Hugo NOUTS

Downloads
- Plain Diff

Merge branch 'dev' into 'master'

Dev

See merge request web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_server!84

parents 995ff147 60cf9016

No related branches found

No related tags found

2 merge requests!86feat/US1-admin-remove-from-struct,!84Dev

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/users/users.service.spec.ts 2 additions, 2 deletions

src/users/users.service.spec.ts
src/users/users.service.ts 4 additions, 4 deletions

src/users/users.service.ts
test/mock/services/categoriesOthers.mock.service.ts 2 additions, 2 deletions

test/mock/services/categoriesOthers.mock.service.ts

with 8 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