Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

2af7b2b9

Commit 2af7b2b9 authored 8 years ago by Alex ORLUC

Downloads
- Plain Diff

Merge branch 'master' of https://labs.maarch.org/maarch/MaarchCourrier

parents d5c6158a fd2e1ba0

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/cas_connect.php 3 additions, 3 deletions

apps/maarch_entreprise/cas_connect.php
apps/maarch_entreprise/lang/en.php 2 additions, 2 deletions

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

apps/maarch_entreprise/lang/fr.php
install/css/merged_css.css 111 additions, 111 deletions

install/css/merged_css.css
modules/entities/lang/en.php 1 addition, 1 deletion

modules/entities/lang/en.php

with 121 additions and 117 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