summary refs log tree commit diff
path: root/gnu/services
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-04-13 13:45:35 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-04-13 13:45:35 -0400
commitc02257b6d1bade6efa528271b55bf8d8ab7b0296 (patch)
tree616bad69b4bacba24c5105336bc282626fcbd114 /gnu/services
parentc371555a4b46a5c9288f54753b0f158f9c4b8abc (diff)
parent0fe2c78cac19acfb46c3bc365075293e51e0e5aa (diff)
downloadguix-c02257b6d1bade6efa528271b55bf8d8ab7b0296.tar.gz
Merge staging branch.
Conflicts resolved in:
	gnu/packages/engineering.scm
	gnu/packages/gnuzilla.scm
	gnu/packages/photo.scm
Diffstat (limited to 'gnu/services')
0 files changed, 0 insertions, 0 deletions