mirror of
https://github.com/go-gitea/gitea.git
synced 2025-02-23 22:28:57 +08:00

resolves git conflicts from #3896 (credit to @belak, in case github doesn't keep original author during squash) Co-Authored-By: Matti Ranta <techknowlogick@gitea.io>