Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

6e02a80e

Verified Commit 6e02a80e authored 7 years ago by Florian Azizian

Downloads
- Plain Diff

Merge branch '18.04' into develop

parents a87c7b46 cae2ecdc

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/class/class_lists_Abstract.php 1 addition, 0 deletions

apps/maarch_entreprise/class/class_lists_Abstract.php
apps/maarch_entreprise/css/engine.css 1 addition, 1 deletion

apps/maarch_entreprise/css/engine.css
modules/attachments/lang/fr.php 205 additions, 205 deletions

modules/attachments/lang/fr.php

with 207 additions and 206 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