Merge branch 'feature/IO-2913-ADP-Payroll' into release/2024-09-13

Browse Source

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

# Conflicts:
#	client/src/translations/en_us/common.json
#	client/src/translations/es/common.json
#	client/src/translations/fr/common.json

...

This commit is contained in:

Allan Carr

2024-09-12 19:59:47 -07:00

parent 4fdb939bd2 9aa1279144

commit c3bfe87674

3 changed files with 10725 additions and 10719 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

7148

client/src/translations/fr/common.json

File diff suppressed because it is too large Load Diff