From: Roman Bazalevsky <rvb@perseus.rvb-home.lan>
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

Merge branch 'master' of rvb.name:gitolite-admin

Conflicts:
	conf/gitolite.conf
---

d4fc3ded0001bd272952b70aea696e9daa5570eb
diff --cc conf/gitolite.conf
index 26cb43a,78ae51e..0e0f13d
--- a/conf/gitolite.conf
+++ b/conf/gitolite.conf
@@@ -26,5 -26,4 +26,4 @@@ repo	weathermo
  	R	=	gitweb daemon
  
  repo	experimental
 -	RW+	=	rvb
 +	RW+	= 	rvb
- 	R	=	gitweb daemon