Merge branch 'master' into staging

With resolved conflicts in:
	gnu/local.mk
	gnu/packages/freedesktop.scm
	gnu/packages/gnuzilla.scm
This commit is contained in:
Maxim Cournoyer 2022-09-15 10:20:32 -04:00
commit 3d297a0017
No known key found for this signature in database
GPG key ID: 1260E46482E63562
118 changed files with 6730 additions and 4851 deletions

View file

@ -2232,3 +2232,9 @@ library.")
(synopsis "Rust binding for webkit-gtk library")
(description "This crate provides Rust binding for webkit-gtk library.")
(license license:expat)))
;;;
;;; Avoid adding new packages to the end of this file. To reduce the chances
;;; of a merge conflict, place them above by existing packages with similar
;;; functionality or similar names.
;;;