Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

5b13d582

Commit 5b13d582 authored 6 years ago by Alex ORLUC

Downloads
- Plain Diff

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

parents dcd39159 733a30fa

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/lang/fr.php 4 additions, 4 deletions

apps/maarch_entreprise/lang/fr.php
core/xml/actions_pages.xml 4 additions, 4 deletions

core/xml/actions_pages.xml
modules/visa/class/IxbusController.php 30 additions, 40 deletions

modules/visa/class/IxbusController.php
modules/visa/redirect_visa_entity.php 22 additions, 0 deletions

modules/visa/redirect_visa_entity.php
package.json 1 addition, 1 deletion

package.json
src/app/entity/controllers/ListTemplateController.php 1 addition, 1 deletion

src/app/entity/controllers/ListTemplateController.php
src/core/lang/lang-en.php 2 additions, 2 deletions

src/core/lang/lang-en.php
src/core/lang/lang-fr.php 2 additions, 2 deletions

src/core/lang/lang-fr.php

with 66 additions and 54 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