Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

archivesPubliques
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

d5e1a01e

Commit d5e1a01e authored 2 years ago by Arnaud Pauget

Downloads
- Plain Diff

Merge branch 'develop' into 'Support/2.8.X'

Develop

See merge request maarch/archivesPubliques!249

parents 658fe9a7 b0883305

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 4 additions, 0 deletions

CHANGELOG.md
VERSION.md 1 addition, 1 deletion

VERSION.md
bundle/archivesPubliques/Controller/content.php 28 additions, 26 deletions

bundle/archivesPubliques/Controller/content.php
data/conf/configuration.ini.default 4 additions, 0 deletions

data/conf/configuration.ini.default
presentation/maarchRM/Presenter/archivesPubliques/content.php 16 additions, 1 deletion

...entation/maarchRM/Presenter/archivesPubliques/content.php

with 53 additions and 28 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