Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

madis
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

f1c13a90

Commit f1c13a90 authored 2 years ago by sebastien dupuy

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/hotfix/2023-03-14' into develop

# Conflicts:
#	templates/Notification/Notification/list.html.twig

parents 3c705700 255ed943

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

config/domain/notification/translations/messages.fr.yaml 1 addition, 1 deletion

config/domain/notification/translations/messages.fr.yaml
src/Domain/Notification/Controller/NotificationController.php 1 addition, 1 deletion

...Domain/Notification/Controller/NotificationController.php
src/Domain/Notification/Dictionary/NotificationModuleDictionary.php 1 addition, 1 deletion

.../Notification/Dictionary/NotificationModuleDictionary.php
templates/Notification/Notification/list.html.twig 8 additions, 1 deletion

templates/Notification/Notification/list.html.twig

with 11 additions and 4 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