summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2014-02-03 21:07:22 -0500
committerRob Austein <sra@hactrn.net>2014-02-03 21:07:22 -0500
commit2e2252d2cc43cf584b3a3f72a4c347f40882100b (patch)
treee4b8dfecd6f605a0f07b79196208ed6da2b1b541 /conf
parent42283869db5b9801812a296fe926816e6f6c7a27 (diff)
parenta4b9ee5cd51d76678fa25e5142aef7052db87497 (diff)
Merge branch 'master' of cryptech.is:gitolite-admin
Attempt to fix yet another access control problem due to gitolite's whacky documentation.
Diffstat (limited to 'conf')
-rw-r--r--conf/gitolite.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/gitolite.conf b/conf/gitolite.conf
index e0b70a7..85871eb 100644
--- a/conf/gitolite.conf
+++ b/conf/gitolite.conf
@@ -1,6 +1,6 @@
# People who administer the repository system.
-@admins = sra randy
+@admins = sra randy sra@hactrn.net randy@psg.com
# For now we use user group @all to mean the cryptech core group. If
# we ever have committers who are not core, we'll likely need a @core