Commit a621cb95 authored by Guillaume Heurtier's avatar Guillaume Heurtier
Browse files

Merge remote-tracking branch 'origin/feat/26803/2301.x.x' into feat/26803/2301.x.x 

# Conflicts:
#	src/app/action/controllers/PreProcessActionController.php
#	src/lang/lang-fr.json
parents 9e8b9d56 74dde63a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment