Merge branch 'master' of rvb.name:gitolite-admin
authorRoman Bazalevsky <rvb@perseus.rvb-home.lan>
Fri, 16 May 2014 14:22:49 +0000 (18:22 +0400)
committerRoman Bazalevsky <rvb@perseus.rvb-home.lan>
Fri, 16 May 2014 14:22:49 +0000 (18:22 +0400)
Conflicts:
conf/gitolite.conf

1  2 
conf/gitolite.conf

index 26cb43ae612992436f8e982e8e481446b794e7ea,78ae51ef12eb9502abffeaa903d20084dca212cb..0e0f13d065e68ed9d9f39001f45c2d17c3bc49a6
@@@ -26,5 -26,4 +26,4 @@@ repo  weathermo
        R       =       gitweb daemon
  
  repo  experimental
 -      RW+     =       rvb
 +      RW+     =       rvb
-       R       =       gitweb daemon