Merge remote-tracking branch 'origin/web/release-4.5'
Conflicts: wiki/src/doc/first_steps/persistence/copy.fr.po Fix conflict by picking the older dates, to try and ensure the PO file has a chance of getting double checked.
Loading
Please register or sign in to comment