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> |
||
|---|---|---|
| .. | ||
| crypto | ||
| net | ||
| oauth2 | ||
| sys | ||
| text | ||
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> |
||
|---|---|---|
| .. | ||
| crypto | ||
| net | ||
| oauth2 | ||
| sys | ||
| text | ||