rest/index.php · 2997ffde47ae512bba34f67e821a5d23607ef98a · Maarch / MaarchCourrier · GitLab

Snippets Groups Projects

Something went wrong on our end

7 years ago
a7e53f72
Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop · a7e53f72
Damien authored 7 years ago
```
Conflicts:
	apps/maarch_entreprise/js/angular/app/app.module.js
	apps/maarch_entreprise/js/angular/app/app.module.ts
```
a7e53f72

History
Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop
Damien authored 7 years ago
```
Conflicts:
	apps/maarch_entreprise/js/angular/app/app.module.js
	apps/maarch_entreprise/js/angular/app/app.module.ts
```