Skip to content
Commit a1cf90c0 authored by anonym's avatar anonym
Browse files

Merge remote-tracking branch 'origin/master' into testing 

Conflicts:
	wiki/src/doc/first_steps/upgrade.fr.po
parents 9fa1af04 19ddcf66
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment