Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

0ffd2222

Commit 0ffd2222 authored 7 years ago by Florian Azizian

Downloads
- Plain Diff

Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop

parents c91cf518 9ba4ea31

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/Views/user-administration.component.html 43 additions, 15 deletions

...aarch_entreprise/Views/user-administration.component.html
apps/maarch_entreprise/js/angular/app/user-administration.component.js 2 additions, 2 deletions

...ntreprise/js/angular/app/user-administration.component.js
apps/maarch_entreprise/js/angular/app/user-administration.component.ts 2 additions, 2 deletions

...ntreprise/js/angular/app/user-administration.component.ts
core/Models/UserModelAbstract.php 1 addition, 1 deletion

core/Models/UserModelAbstract.php

with 48 additions and 20 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