Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

4340f485

Verified Commit 4340f485 authored 6 years ago by Florian Azizian

Downloads
- Plain Diff

Merge branch '18.04' into develop

parents 95c857f1 524ed5d2

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

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

apps/maarch_entreprise/lang/fr.php
apps/maarch_entreprise/smartphone/details.php 52 additions, 32 deletions

apps/maarch_entreprise/smartphone/details.php
apps/maarch_entreprise/smartphone/list_result.php 9 additions, 9 deletions

apps/maarch_entreprise/smartphone/list_result.php
modules/attachments/lang/fr.php 224 additions, 141 deletions

modules/attachments/lang/fr.php
sql/1804.sql 1 addition, 1 deletion

sql/1804.sql
sql/data_fr.sql 1 addition, 1 deletion

sql/data_fr.sql
sql/delete_all_ressources.sql 83 additions, 83 deletions

sql/delete_all_ressources.sql
src/app/group/controllers/GroupController.php 2 additions, 2 deletions

src/app/group/controllers/GroupController.php
src/core/lang/lang-en.php 10 additions, 10 deletions

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

src/core/lang/lang-fr.php

with 393 additions and 290 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