05/05: Merge branch 'master' into core-updates.

2023-04-14 Thread guix-commits
apteryx pushed a commit to branch core-updates in repository guix. commit 3bacd3c76a58ebe70f98be654f09cbd4166093ab Merge: df3391c030 97ed675718 Author: Maxim Cournoyer AuthorDate: Fri Apr 14 16:57:37 2023 -0400 Merge branch 'master' into core-updates. Conflicts: gnu/loca

05/05: Merge branch 'master' into core-updates

2018-03-20 Thread Mark H. Weaver
mhw pushed a commit to branch core-updates in repository guix. commit ac21be848ac420d2106d4441e9e48ea6a60c5c8c Merge: d3da21d 4a78fd4 Author: Mark H Weaver Date: Tue Mar 20 14:22:06 2018 -0400 Merge branch 'master' into core-updates .mailmap | 2