Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop
Showing
- apps/maarch_entreprise/Views/basket-administration.component.html 1 addition, 3 deletions...rch_entreprise/Views/basket-administration.component.html
- apps/maarch_entreprise/js/angular/app/administration/basket-administration.component.ts 3 additions, 3 deletions...lar/app/administration/basket-administration.component.ts
- apps/maarch_entreprise/js/angular/app/administration/group-administration.component.ts 2 additions, 3 deletions...ular/app/administration/group-administration.component.ts
- apps/maarch_entreprise/js/angular/lang/lang-en.ts 123 additions, 120 deletionsapps/maarch_entreprise/js/angular/lang/lang-en.ts
- apps/maarch_entreprise/js/angular/lang/lang-fr.ts 242 additions, 239 deletionsapps/maarch_entreprise/js/angular/lang/lang-fr.ts
- src/core/models/CoreConfigModel.php 40 additions, 55 deletionssrc/core/models/CoreConfigModel.php
- src/core/models/DatabasePDO.php 3 additions, 10 deletionssrc/core/models/DatabasePDO.php
Loading
Please register or sign in to comment