Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

524ec7e1

Commit 524ec7e1 authored 8 years ago by Damien

Downloads
- Plain Diff

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

parents 2f23a512 8551d909

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/Models/ContactsModel.php 13 additions, 16 deletions

apps/maarch_entreprise/Models/ContactsModel.php
apps/maarch_entreprise/Models/ContactsModelAbstract.php 27 additions, 18 deletions

apps/maarch_entreprise/Models/ContactsModelAbstract.php
core/Controllers/ResController.php 142 additions, 118 deletions

core/Controllers/ResController.php
core/Models/ResModelAbstract.php 132 additions, 0 deletions

core/Models/ResModelAbstract.php
core/Test/ResControllerTest.php 155 additions, 47 deletions

core/Test/ResControllerTest.php
modules/sendmail/class/class_modules_tools_Abstract.php 1 addition, 1 deletion

modules/sendmail/class/class_modules_tools_Abstract.php
modules/tags/class/TagControler_Abstract.php 5 additions, 7 deletions

modules/tags/class/TagControler_Abstract.php

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