Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

1cf7dc6a

Verified Commit 1cf7dc6a authored 6 years ago by Damien

Downloads
- Plain Diff

Merge branch '18.04' into develop

parents 3b86c748 424c4b0a

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/ozwilloConnect.php 2 additions, 2 deletions

apps/maarch_entreprise/ozwilloConnect.php
apps/maarch_entreprise/xml/ozwilloConfig.xml 2 additions, 0 deletions

apps/maarch_entreprise/xml/ozwilloConfig.xml
core/class/PrintControler.php 3 additions, 3 deletions

core/class/PrintControler.php
modules/entities/css/module.css 8 additions, 1 deletion

modules/entities/css/module.css
modules/entities/loadDiffList.php 53 additions, 15 deletions

modules/entities/loadDiffList.php
src/core/models/CoreConfigModel.php 2 additions, 0 deletions

src/core/models/CoreConfigModel.php

with 70 additions and 21 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