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

Merge branch 'web/release-3.14' 

Conflicts:
	wiki/src/inc/stable_amd64_img_gpg_signature_output.html
	wiki/src/inc/stable_amd64_iso_gpg_signature_output.html

Resolve conflicts by picking the signatures from the web/release-3.14
branch, the other ones were just fixups for the previous release.
parents 482e31d3 432e8a1b
Branches
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 4543 additions and 4738 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment