Merge branch 'Narthall-master-patch-08710' into 'dev'

Updated the fr.json language file:

See merge request Shinobi-Systems/Shinobi!321
change-spawn-to-worker-for-monitor-daemon
Moe 2021-08-13 18:00:51 +00:00
commit b0f2fc21d8
1 changed files with 903 additions and 354 deletions

File diff suppressed because it is too large Load Diff