Skip to content
Snippets Groups Projects
Commit ab4aad44 authored by Cyril 'kibi' Brulebois's avatar Cyril 'kibi' Brulebois
Browse files

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.
parents ed786d37 45e38b3d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment