From: Roman Bazalevskiy <rvb@rvb.name>
Date: Tue, 26 Dec 2017 09:11:11 +0000 (+0300)
Subject: Merge branch 'master' of ssh://rvb.name/gitolite-admin
X-Git-Url: https://git.rvb.name/gitolite-admin.git/commitdiff_plain/7cc314eccafcf99adf3031bb7126371f09166571?hp=52688cc783bae6538d47b03712b3e4a2bda8b966

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

diff --git a/conf/gitolite.conf b/conf/gitolite.conf
index ba08e8d..067aa86 100644
--- a/conf/gitolite.conf
+++ b/conf/gitolite.conf
@@ -74,6 +74,10 @@ repo    setroute
 	RW+     =       rvb
 	R	=	daemon
 
+repo	mpd-lua
+	RW+	=	rvb
+	R	=	gitweb daemon
+
 repo	n2100
 	RW+	=	rvb
 	R	=	gitweb daemon
diff --git a/conf/gitolite.conf~ b/conf/gitolite.conf~
new file mode 100644
index 0000000..33bd171
--- /dev/null
+++ b/conf/gitolite.conf~
@@ -0,0 +1,83 @@
+repo    gitolite-admin
+        RW+     =   	rvb
+
+repo    testing
+        RW+     =   	@all
+	R	=	gitweb daemon
+
+repo	openlib
+	RW+	=   	rvb
+	R	=	gitweb daemon
+
+repo 	pyrungps
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	indicator-nut
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	zenbook-als
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	weathermon
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	oss-streamer
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	rtl-433
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+
+repo	sync-ebook
+	RW+	= 	rvb
+	R	=	gitweb daemon
+
+repo	vpproxy
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	ddns
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	php
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	openhab-process
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	mpd-web
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	lede-packages
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	i2c-telemetry
+	RW+	=	rvb
+	R	=	gitweb daemon
+
+repo	gpio-int
+	RW+	= 	rvb
+	R	=	gitweb daemon
+
+repo    setroute
+	RW+     =       rvb
+	R	=	daemon
+
+<<<<<<< HEAD
+repo	mpd-lua
+=======
+repo	n2100
+>>>>>>> 52688cc783bae6538d47b03712b3e4a2bda8b966
+	RW+	=	rvb
+	R	=	gitweb daemon