Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

536c34c0

Verified Commit 536c34c0 authored 7 years ago by Alexandre Morin

Downloads
- Plain Diff

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

parents 54d7365b 8135cc37

No related branches found

No related tags found

No related merge requests found

Changes 4

Expand all Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/Views/entities-administration.component.html 19 additions, 6 deletions

...h_entreprise/Views/entities-administration.component.html
apps/maarch_entreprise/js/angular/app/administration/entities-administration.component.ts 144 additions, 189 deletions

...r/app/administration/entities-administration.component.ts
apps/maarch_entreprise/js/angular/lang/lang-en.ts 1 addition, 0 deletions

apps/maarch_entreprise/js/angular/lang/lang-en.ts
apps/maarch_entreprise/js/angular/lang/lang-fr.ts 1 addition, 0 deletions

apps/maarch_entreprise/js/angular/lang/lang-fr.ts

with 165 additions and 195 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