Commit 4e2bafaf authored 6 years ago by Cyril Brulebois

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

No related branches found

No related tags found

Show whitespace changes

Inline Side-by-side

Showing with 4543 additions and 4738 deletions

Please register or to comment