Yair Morgenstern d0a4111d84 I think I found the conflict - checkout ref!		2023-11-28 12:14:56 +02:00
..
buildAndDeploy.yml
buildAndTest.yml
buildMultiplatform.yml
conflicts.yml
detektAnalysis.yml
dockerPublish.yml
incrementVersionAndChangelog.js
mergeTranslations.js
mkdocs.yml
releasePatch.js	Added patch automation step!	2023-11-28 11:06:40 +02:00
uncivbot.yml	I think I found the conflict - checkout ref!	2023-11-28 12:14:56 +02:00