mirror of
https://gitcode.com/gitea/gitea.git
synced 2025-11-13 02:29:20 +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>