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