Skip to content
Snippets Groups Projects
Commit 5f2d3ee0 authored by Guillaume Heurtier's avatar Guillaume Heurtier
Browse files

FIX #15736 TIME 1:15 change signature date format + doc

parent e16e01d2
No related branches found
No related tags found
No related merge requests found
......@@ -544,7 +544,7 @@ class MergeController
ValidatorModel::stringType($args, ['type']);
$mergeData = [
'date' => date('d/m/Y'),
'date' => date('d-m-Y'),
'user' => UserModel::getLabelledUserById(['id' => $GLOBALS['id']]),
'entity' => UserModel::getPrimaryEntityById(['id' => $GLOBALS['id'], 'select' => ['*']])
];
......
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