diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-30 12:17:33 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-30 12:17:33 +0200 |
| commit | ae0badf5bb791428423a98d4e4e2b8d297a5d4be (patch) | |
| tree | 4282d243db3e90839a5f7d3b5878674ccd0e2e14 /build-aux | |
| parent | ee401ed9249fbe284ef1b9b437d39207ca88131b (diff) | |
| parent | 927f3655662b41f25225ea03baa3ded687aa7cbb (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/guile.scm
gnu/packages/linux.scm
gnu/packages/package-management.scm
gnu/packages/pulseaudio.scm
gnu/packages/web.scm
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/git-authenticate.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index 514d201c804..37e0c6800c9 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm | |||
| @@ -61,6 +61,9 @@ | |||
| 61 | ("atheia" | 61 | ("atheia" |
| 62 | ;; primary: "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948" | 62 | ;; primary: "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948" |
| 63 | "9A2B 401E D001 0650 1584 BAAC 8BC4 F447 6E8A 8E00") | 63 | "9A2B 401E D001 0650 1584 BAAC 8BC4 F447 6E8A 8E00") |
| 64 | ("bandali" | ||
| 65 | ;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103" | ||
| 66 | "39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2") | ||
| 64 | ("bavier" | 67 | ("bavier" |
| 65 | ;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E" | 68 | ;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E" |
| 66 | "A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566") | 69 | "A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566") |
| @@ -133,9 +136,6 @@ | |||
| 133 | "B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08") | 136 | "B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08") |
| 134 | ("lsl88" | 137 | ("lsl88" |
| 135 | "2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC") | 138 | "2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC") |
| 136 | ("mab" | ||
| 137 | ;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103" | ||
| 138 | "39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2") | ||
| 139 | ("marusich" | 139 | ("marusich" |
| 140 | "CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D") | 140 | "CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D") |
| 141 | ("mbakke" | 141 | ("mbakke" |