mirror of
https://github.com/go-gitea/gitea
synced 2025-02-06 17:07:04 +01: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>