-
- Downloads
Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop
Conflicts: apps/maarch_entreprise/xml/entreprise.xml
Showing
- .gitignore 2 additions, 1 deletion.gitignore
- apps/maarch_entreprise/js/angular/app/Views/signatureBook.html 2 additions, 2 deletions...maarch_entreprise/js/angular/app/Views/signatureBook.html
- apps/maarch_entreprise/xml/entreprise.xml 17 additions, 13 deletionsapps/maarch_entreprise/xml/entreprise.xml
- modules/avis/class/avis_controler_Abstract.php 1 addition, 1 deletionmodules/avis/class/avis_controler_Abstract.php
- modules/avis/lang/en.php 3 additions, 0 deletionsmodules/avis/lang/en.php
- modules/avis/lang/fr.php 4 additions, 1 deletionmodules/avis/lang/fr.php
- modules/visa/class/class_modules_tools_Abstract.php 2 additions, 2 deletionsmodules/visa/class/class_modules_tools_Abstract.php
- modules/visa/css/module.css 21 additions, 6 deletionsmodules/visa/css/module.css
- modules/visa/lang/en.php 6 additions, 0 deletionsmodules/visa/lang/en.php
- modules/visa/lang/fr.php 7 additions, 1 deletionmodules/visa/lang/fr.php
Loading
Please register or sign in to comment