guix/doc
Marius Bakke 6f9a80b331
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a277 and
12964df69a respectively.

4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.

 Conflicts:
	gnu/local.mk
	gnu/packages/aidc.scm
	gnu/packages/boost.scm
	gnu/packages/curl.scm
	gnu/packages/nettle.scm
	gnu/packages/networking.scm
	gnu/packages/python-xyz.scm
	gnu/packages/tls.scm
2021-06-19 17:38:47 +02:00
..
images
build.scm Merge branch 'master' into core-updates 2021-05-09 21:29:46 +02:00
contributing.texi doc: Clarify Git commit signing; fix typo. 2021-06-18 14:18:07 +02:00
environment-gdb.scm
fdl-1.3.texi
guix-cookbook.texi
guix.texi Merge branch 'master' into core-updates 2021-06-19 17:38:47 +02:00
htmlxref.cnf doc: Fix cross-reference URL to translated manual. 2021-04-25 14:36:33 +02:00
local.mk nls: Guard against the list of translated Texinfo files becoming stale. 2021-05-03 22:41:35 -04:00
package-hello.json
package-hello.scm