Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

c62e943c

Verified Commit c62e943c authored 7 years ago by Florian Azizian

Downloads
- Plain Diff

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

parents 5421a8c9 220c9900

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/Views/administration.component.html 4 additions, 4 deletions

apps/maarch_entreprise/Views/administration.component.html
apps/maarch_entreprise/Views/menuNav.component.html 6 additions, 0 deletions

apps/maarch_entreprise/Views/menuNav.component.html
apps/maarch_entreprise/index.php 14 additions, 23 deletions

apps/maarch_entreprise/index.php
apps/maarch_entreprise/log.php 3 additions, 0 deletions

apps/maarch_entreprise/log.php
install/scripts/testSmtp.php 1 addition, 1 deletion

install/scripts/testSmtp.php
src/app/contact/controllers/ContactController.php 3 additions, 6 deletions

src/app/contact/controllers/ContactController.php
src/core/controllers/PreparedClauseController.php 1 addition, 1 deletion

src/core/controllers/PreparedClauseController.php

with 32 additions and 35 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