Merge branch 'disable-client-certs' of github.com:oddeirik/gitblit into oddeirik...

author Florian Zschocke <f.zschocke+git@gmail.com>

Sun, 14 Aug 2022 12:10:09 +0000 (14:10 +0200)

committer Florian Zschocke <f.zschocke+git@gmail.com>

Sun, 14 Aug 2022 12:10:09 +0000 (14:10 +0200)
author Florian Zschocke <f.zschocke+git@gmail.com>
Sun, 14 Aug 2022 12:10:09 +0000 (14:10 +0200)
committer Florian Zschocke <f.zschocke+git@gmail.com>
Sun, 14 Aug 2022 12:10:09 +0000 (14:10 +0200)
diff --cc src/main/distrib/data/defaults.properties
Simple merge
diff --cc src/main/java/com/gitblit/GitBlitServer.java
Simple merge
author	Florian Zschocke <f.zschocke+git@gmail.com>
	Sun, 14 Aug 2022 12:10:09 +0000 (14:10 +0200)
committer	Florian Zschocke <f.zschocke+git@gmail.com>
	Sun, 14 Aug 2022 12:10:09 +0000 (14:10 +0200)
		1	2
src/main/distrib/data/defaults.properties	patch \|	diff1 \|	diff2 \|	blob \| history
src/main/java/com/gitblit/GitBlitServer.java	patch \|	diff1 \|	diff2 \|	blob \| history