Skip to content
Snippets Groups Projects
Commit 251d996a authored by Prosper De Laure's avatar Prosper De Laure
Browse files

Merge branch 'feature/7322-EventLoggingException' into hotfix/2.1.2

# Conflicts:
#	src/presentation/maarchRM/Resources/locale/fr/audit/messages.po
parents 9a674dfb ff52a608
No related branches found
No related tags found
Loading
Showing
with 148 additions and 15 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 to comment