Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

42a45b9e

Commit 42a45b9e authored 7 years ago by Alex ORLUC

Downloads
- Plain Diff

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

parents bb052554 a5e57fa1

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/class/class_types_Abstract.php 25 additions, 18 deletions

apps/maarch_entreprise/class/class_types_Abstract.php
apps/maarch_entreprise/lang/fr.php 1 addition, 1 deletion

apps/maarch_entreprise/lang/fr.php
apps/maarch_entreprise/xml/IVS/validation_rules.xml 1 addition, 1 deletion

apps/maarch_entreprise/xml/IVS/validation_rules.xml
install/lang/en.php 4 additions, 0 deletions

install/lang/en.php
install/lang/fr.php 4 additions, 0 deletions

install/lang/fr.php
sql/data_fr.sql 11 additions, 10 deletions

sql/data_fr.sql

with 46 additions and 30 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