summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-09-04 20:39:11 +0200
committerGregor Kleen <gkleen@yggdrasil.li>2016-09-04 20:39:11 +0200
commit2ac9685fb7b9fe5226e7e9258b6ed1b1408890ab (patch)
treec5d1b26adefd9d04b2805ade30e55427522d75f6 /users
parenta613b78f92b9c68644cc188075d12c31e10558ee (diff)
parent2c5a6fd3a476ae80996f4072cf5bba4f45bedf59 (diff)
downloadnixos-2ac9685fb7b9fe5226e7e9258b6ed1b1408890ab.tar
nixos-2ac9685fb7b9fe5226e7e9258b6ed1b1408890ab.tar.gz
nixos-2ac9685fb7b9fe5226e7e9258b6ed1b1408890ab.tar.bz2
nixos-2ac9685fb7b9fe5226e7e9258b6ed1b1408890ab.tar.xz
nixos-2ac9685fb7b9fe5226e7e9258b6ed1b1408890ab.zip
Merge branch 'master' of git.yggdrasil.li:nixos
Diffstat (limited to 'users')
-rw-r--r--users/keys/gkleen-media-hel.pub (renamed from users/keys/gkleen-media@hel.pub)0
1 files changed, 0 insertions, 0 deletions
diff --git a/users/keys/gkleen-media@hel.pub b/users/keys/gkleen-media-hel.pub
index 064eaaf7..064eaaf7 100644
--- a/users/keys/gkleen-media@hel.pub
+++ b/users/keys/gkleen-media-hel.pub