Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

18cd54de

Verified Commit 18cd54de authored 7 years ago by Giovannoni Laurent

Downloads
- Plain Diff

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

parents 8e01a166 532356bf

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/Views/status-administration.component.html 1 addition, 1 deletion

...rch_entreprise/Views/status-administration.component.html
apps/maarch_entreprise/css/engine.css 1 addition, 0 deletions

apps/maarch_entreprise/css/engine.css
apps/maarch_entreprise/js/angular/app/administration/status-administration.component.js 2 additions, 2 deletions

...lar/app/administration/status-administration.component.js
apps/maarch_entreprise/js/angular/app/administration/status-administration.component.ts 5 additions, 5 deletions

...lar/app/administration/status-administration.component.ts
apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.js 1 addition, 1 deletion

...r/app/administration/statuses-administration.component.js
apps/maarch_entreprise/js/angular/app/administration/statuses-administration.component.ts 1 addition, 1 deletion

...r/app/administration/statuses-administration.component.ts
apps/maarch_entreprise/lang/fr.php 1 addition, 1 deletion

apps/maarch_entreprise/lang/fr.php

with 12 additions and 11 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