diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-05 14:21:20 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-08-05 14:21:20 -0300 |
commit | c44036057e12e984abd25403c1f6ee5a8cad7aaf (patch) | |
tree | 7d7f76bbc744bcef3a3429002a9e82afd846dbb0 | |
parent | 79bece254b0697bdebd8f0a4b7491a1521fdd6fb (diff) | |
parent | fa668c37278d6f6316180f9ac519348852092937 (diff) |
Merge branch 'master' of ssh://gparabola/gitosis-admin
Conflicts:
gitosis.conf
-rw-r--r-- | gitosis.conf | 2 | ||||
-rw-r--r-- | keydir/jy@Dunkelheit.pub | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gitosis.conf b/gitosis.conf index 754704d..b8c80ad 100644 --- a/gitosis.conf +++ b/gitosis.conf @@ -8,5 +8,5 @@ writable = gitosis-admin members = smv@delta.yobicore.org fauno@kiwwwi.com.ar [group hackers] -members = jyaworski.pub aurelien.pub cer@rosenkrantz.pub hahj87@gmail.com.pub jbeatty@jbeatty-laptop.pub joshpar@stravy.pub leo@kde.org.ar.pub mtjm@mtjm.eu.pub rosario@gs-eee.pub @admins +members = jy@Dunkelheit aurelien cer@rosenkrantz hahj87@gmail.com jbeatty@jbeatty-laptop joshpar@stravy leo@kde.org.ar mtjm@mtjm.eu rosario@gs-eee @admins writable = abslibre abslibre-mips64el aif arch2parabola archiso blacklist cross-mips64el-unknown-linux-gnu dbscripts initscripts issuetracker libretools libui-sh linux-libre-2.6-LIBRE parabola-archiso parabolasocial parabolaweb pbot repo-maintainer diff --git a/keydir/jy@Dunkelheit.pub b/keydir/jy@Dunkelheit.pub new file mode 100644 index 0000000..f765a4b --- /dev/null +++ b/keydir/jy@Dunkelheit.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCr6tI9g96t+4tKkcUIbk3tlj61bd+RHfQ26wsCEMUiWLxema4X/oxFD5du893NAcSppR1cvAwsw0Qw2+/MNlSbEsUMobbRuD45KOJ2Q7h9/aXQqComluwV5z/OYf+DWhHr7g/brQfpumvyJPayaPE7/QlyAnV3DeluWvOOtKzDzRt5yWMqlCew76JNvMY12Pt6uqWjaXFJCoVZF2SeFmpyEQvfruTtU3y16TlFRKKXUwefqhY453Ml3E5G+H/BYMgAvXJze6xIj3Dm1hbxbe9bJYWyvCUH1rnWHvDKfFDHQ25L2aa6RVmKhPDgHU3ZAxW2UB2F5Mz1gl/bRxn3I+xz jy@Dunkelheit |