Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

f2dbc512

Commit f2dbc512 authored 7 years ago by Alex ORLUC

Downloads
- Plain Diff

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

parents 440fb0db 1df836b8

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/admin/contacts/manage_duplicates.php 4 additions, 4 deletions

apps/maarch_entreprise/admin/contacts/manage_duplicates.php
apps/maarch_entreprise/lang/en.php 3 additions, 1 deletion

apps/maarch_entreprise/lang/en.php
apps/maarch_entreprise/lang/fr.php 1 addition, 0 deletions

apps/maarch_entreprise/lang/fr.php
core/class/class_security.php 85 additions, 141 deletions

core/class/class_security.php
core/class/users_controler.php 1 addition, 1 deletion

core/class/users_controler.php
core/services/SessionAbstract.php 0 additions, 23 deletions

core/services/SessionAbstract.php

with 94 additions and 170 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