summaryrefslogtreecommitdiffstats
path: root/kartei
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2022-11-29 19:54:28 +0100
committertv <tv@krebsco.de>2022-11-29 19:54:28 +0100
commit43428ccca56bdf10572f1c93ebafa82cfdf7dbf5 (patch)
treeb6c79e4f047ccb8842c9e5f7b73688ccbc5ff053 /kartei
parent5c05e2a9b68b01e1f0f69a1e4414bce21a801f1f (diff)
parent32b23666d15861f6f4d8b1f522ee53d4f21fabb6 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'kartei')
-rw-r--r--kartei/krebs/default.nix1
-rw-r--r--kartei/others/ssh/xkey.pub2
2 files changed, 2 insertions, 1 deletions
diff --git a/kartei/krebs/default.nix b/kartei/krebs/default.nix
index b33a54f9a..6da73ff83 100644
--- a/kartei/krebs/default.nix
+++ b/kartei/krebs/default.nix
@@ -78,6 +78,7 @@ in {
"build.r"
"build.hotdog.r"
"ca.r"
+ "calendar.r"
"cgit.hotdog.r"
"irc.r"
"wiki.r"
diff --git a/kartei/others/ssh/xkey.pub b/kartei/others/ssh/xkey.pub
index cd09f06bb..a50522fce 100644
--- a/kartei/others/ssh/xkey.pub
+++ b/kartei/others/ssh/xkey.pub
@@ -1 +1 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIZFKgFcAEGXcsssJxDeUVvOTKD0U4LlT2Yw85+WmMTj
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPVwyWKyTjg00x1M1PCDBXbixmdZObZiMLAW0f9KGFvC