Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

f7d8cd77

Commit f7d8cd77 authored 5 years ago by Alex ORLUC

Downloads
- Plain Diff

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

parents 806f9084 1373ee3d

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/lang/fr.php 1 addition, 4 deletions

apps/maarch_entreprise/lang/fr.php
apps/maarch_entreprise/lang/nl.php 0 additions, 1 deletion

apps/maarch_entreprise/lang/nl.php
core/xml/actions_pages.xml 0 additions, 13 deletions

core/xml/actions_pages.xml
src/core/lang/lang-en.php 0 additions, 1 deletion

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

src/core/lang/lang-fr.php
src/core/lang/lang-nl.php 0 additions, 1 deletion

src/core/lang/lang-nl.php
src/frontend/lang/lang-fr.ts 3 additions, 3 deletions

src/frontend/lang/lang-fr.ts

with 5 additions and 25 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