diff options
| author | Peter Todd <pete@petertodd.org> | 2016-05-20 08:55:57 +0100 |
|---|---|---|
| committer | Peter Todd <pete@petertodd.org> | 2016-05-21 11:29:01 +0200 |
| commit | 11164ec0b4c1790059220b09b5827e5618a46c76 (patch) | |
| tree | 8282a599e5a5cfd52a0282e82162e22c810cdf8b /contrib | |
| parent | 22421faa199b7922259b4b55e6471a1b5f91d0da (diff) | |
Remove keys that are no longer used for merging
Also updated trusted git root to be right after gmaxwell's last merge.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/verify-commits/trusted-git-root | 2 | ||||
| -rw-r--r-- | contrib/verify-commits/trusted-keys | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/contrib/verify-commits/trusted-git-root b/contrib/verify-commits/trusted-git-root index 838b8d1ea8..c60f8ab695 100644 --- a/contrib/verify-commits/trusted-git-root +++ b/contrib/verify-commits/trusted-git-root @@ -1 +1 @@ -165e323d851cc87213c7673c6f278e87a6f2e752 +82bcf405f6db1d55b684a1f63a4aabad376cdad7 diff --git a/contrib/verify-commits/trusted-keys b/contrib/verify-commits/trusted-keys index ad1b28be0c..9c36d58cd2 100644 --- a/contrib/verify-commits/trusted-keys +++ b/contrib/verify-commits/trusted-keys @@ -1,8 +1,5 @@ 71A3B16735405025D447E8F274810B012346C9A6 1F4410F6A89268CE3197A84C57896D2FF8F0B657 -01CDF4627A3B88AAE4A571C87588242FBE38D3A8 -AF8BE07C7049F3A26B239D5325B3083201782B2F -81291FA67D2C379A006A053FEAB5AF94D9E9ABE7 3F1888C6DCA92A6499C4911FDBA1A67379A1A931 32EE5C4C3FA15CCADB46ABE529D4BCB6416F53EC FE09B823E6D83A3BC7983EAA2D7F2372E50FE137 |