From: Roman Bazalevsky Date: Fri, 16 May 2014 14:22:49 +0000 (+0400) Subject: Merge branch 'master' of rvb.name:gitolite-admin X-Git-Url: https://git.rvb.name/gitolite-admin.git/commitdiff_plain/d4fc3ded0001bd272952b70aea696e9daa5570eb?hp=46588457a2c580f9c6d5ffe6a570151ad3a3236b Merge branch 'master' of rvb.name:gitolite-admin Conflicts: conf/gitolite.conf --- diff --git a/conf/gitolite.conf b/conf/gitolite.conf index 78ae51e..0e0f13d 100644 --- a/conf/gitolite.conf +++ b/conf/gitolite.conf @@ -26,4 +26,4 @@ repo weathermon R = gitweb daemon repo experimental - RW+ = rvb + RW+ = rvb