Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

cc005bee

Commit cc005bee authored 8 years ago by Florian Azizian

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into develop

parents 0303bab9 a8acbbaf

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/xml/entreprise.xml 17 additions, 13 deletions

apps/maarch_entreprise/xml/entreprise.xml
modules/avis/class/avis_controler_Abstract.php 1 addition, 1 deletion

modules/avis/class/avis_controler_Abstract.php
modules/avis/lang/en.php 3 additions, 0 deletions

modules/avis/lang/en.php
modules/avis/lang/fr.php 4 additions, 1 deletion

modules/avis/lang/fr.php
modules/visa/class/class_modules_tools_Abstract.php 2 additions, 2 deletions

modules/visa/class/class_modules_tools_Abstract.php
modules/visa/lang/en.php 6 additions, 0 deletions

modules/visa/lang/en.php
modules/visa/lang/fr.php 7 additions, 1 deletion

modules/visa/lang/fr.php

with 40 additions and 18 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