Merge branch 'feature/pico-image' into feature/nextcloud-portable

Fix use correct keyring
2024-07-16 01:10:21 +02:00 · 2024-07-16 01:09:33 +02:00
2 changed files with 0 additions and 10 deletions
--- a/mkosi.images/pico/mkosi.extra/usr/lib/systemd/import-pubring.asc
+++ b/mkosi.images/pico/mkosi.extra/usr/lib/systemd/import-pubring.asc
@ -1,10 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEZZnR4RYJKwYBBAHaRw8BAQdAGRcV4reORo51jiWK0umHCTEIVPYVP0fdmkGg
-yRpOYzO0M3JhZmVPUyByZWxlYXNlIHNpZ25pbmcga2V5IDxyYWZlb3MtcmVsZWFz
-ZUByYWZlLmxpPoiUBBMWCgA8FiEESXsbF77lPV3wroM/YHdZAN3fqmcFAmWZ0eEC
-GwMFCQWjmoAECwkIBwQVCgkIBRYCAwEAAh4FAheAAAoJEGB3WQDd36pn95YBAJ46
-x71+zLZLGgqxbipMNZXTQhJX4t8BMCMyqY/1PB5wAP9v83NKCUx13LpXHcWASxOu
-EcW60JxJ/K6qn5ciCmVxAA==
-=ubh/
-----END PGP PUBLIC KEY BLOCK-----
--- a/mkosi.images/pico/mkosi.extra/usr/lib/systemd/import-pubring.gpg
+++ b/mkosi.images/pico/mkosi.extra/usr/lib/systemd/import-pubring.gpg
Author	SHA1	Message	Date
Tobias Strobel	1468b6156e	Merge branch 'feature/pico-image' into feature/nextcloud-portable	2024-07-16 01:10:21 +02:00
Tobias Strobel	5196713f50	Fix use correct keyring	2024-07-16 01:09:33 +02:00