Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

maarchRM
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

945d51c4

Commit 945d51c4 authored 2 years ago by Cyril Vazquez

Downloads
- Plain Diff

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

Develop

See merge request !781

parents 567ac6e2 64fb881d

No related branches found

Tags 2.9.4

3 merge requests!838Rebase develop,!835Support/2.9.x,!781Develop

Pipeline #22767 failed 2 years ago

Stage: build

Stage: tests

Changes 7
Pipelines 2

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 6 additions, 0 deletions

CHANGELOG.md
VERSION.md 1 addition, 1 deletion

VERSION.md
data/maarchRM/conf/configuration.ini.default 16 additions, 1 deletion

data/maarchRM/conf/configuration.ini.default
dependency/fileSystem/plugins/GhostScript.php 10 additions, 9 deletions

dependency/fileSystem/plugins/GhostScript.php
src/presentation/maarchRM/Resources/locale/fr/audit/messages.po 2 additions, 2 deletions

...esentation/maarchRM/Resources/locale/fr/audit/messages.po
src/presentation/maarchRM/Resources/view/auth/userAccount/admin/edit.html 1 addition, 1 deletion

.../maarchRM/Resources/view/auth/userAccount/admin/edit.html
src/presentation/maarchRM/Resources/view/digitalResource/conversionRule/edit.html 2 additions, 2 deletions

...M/Resources/view/digitalResource/conversionRule/edit.html

with 38 additions and 16 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