Skip to content

Actions: ss220-space/Skyrat-tg

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
163 workflow runs
163 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Cleanup admins config Merge Conflict Detection #76: Commit f379dec pushed by Dimach
September 24, 2023 10:45 2m 12s master220
master220
September 24, 2023 10:45 2m 12s
add: EX666 discord emojis Merge Conflict Detection #75: Pull request #27 synchronize by Dimach
September 24, 2023 10:31 12s
September 24, 2023 10:31 12s
Cleanup admins config Merge Conflict Detection #74: Commit 086116a pushed by Dimach
September 24, 2023 10:27 2m 13s master220
master220
September 24, 2023 10:27 2m 13s
add: EX666 discord emojis Merge Conflict Detection #73: Pull request #27 opened by RosSample
September 16, 2023 15:04 13s
September 16, 2023 15:04 13s
add: TTS voice change for AI and cyborgs (#26) Merge Conflict Detection #72: Commit 336064f pushed by Dimach
September 15, 2023 17:49 10s master220
master220
September 15, 2023 17:49 10s
Tweak: Screentips/Say fonts (#25) Merge Conflict Detection #71: Commit 28810aa pushed by Dimach
September 15, 2023 17:48 9s master220
master220
September 15, 2023 17:48 9s
add: TTS voice change for AI and cyborgs Merge Conflict Detection #70: Pull request #26 opened by RosSample
September 8, 2023 18:23 14s
September 8, 2023 18:23 14s
Tweak: Screentips/Say fonts Merge Conflict Detection #69: Pull request #25 opened by Zagovori
September 8, 2023 16:30 14s
September 8, 2023 16:30 14s
Medicells recipies in the description Merge Conflict Detection #68: Pull request #24 synchronize by Dimach
September 8, 2023 09:15 16s
September 8, 2023 09:15 16s
Clown/mime not only for veterans Merge Conflict Detection #67: Commit b7d0240 pushed by Dimach
September 8, 2023 09:06 2m 12s master220
master220
September 8, 2023 09:06 2m 12s
Feat: add shutdown on reboot option Merge Conflict Detection #66: Commit c4313f5 pushed by Dimach
August 31, 2023 19:54 2m 15s master220
master220
August 31, 2023 19:54 2m 15s
Feat: add shutdown on reboot option Merge Conflict Detection #65: Commit 6eb7b5d pushed by Dimach
August 31, 2023 19:49 2m 10s master220
master220
August 31, 2023 19:49 2m 10s
Feat: add shutdown on reboot option Merge Conflict Detection #64: Commit 8ae470c pushed by Dimach
August 31, 2023 19:35 2m 16s master220
master220
August 31, 2023 19:35 2m 16s
Medicells recipies in the description Merge Conflict Detection #63: Pull request #24 opened by RosSample
August 30, 2023 10:27 10s
August 30, 2023 10:27 10s
Feat: add shutdown on reboot option Merge Conflict Detection #62: Commit b056806 pushed by Bizzonium
August 28, 2023 19:18 10s master220
master220
August 28, 2023 19:18 10s
Chore: bump rust-g to 3.0.0-ss220 Merge Conflict Detection #61: Commit a659de2 pushed by Bizzonium
August 23, 2023 17:10 10s master220
master220
August 23, 2023 17:10 10s
Chore: bump rust-g to 3.0.0-ss220 Merge Conflict Detection #60: Commit 9a68862 pushed by Bizzonium
August 23, 2023 17:06 13s master220
master220
August 23, 2023 17:06 13s
Chore: bump rust-g to 3.0.0-ss220 Merge Conflict Detection #59: Commit 5fc64d1 pushed by Bizzonium
August 23, 2023 17:06 11s master220
master220
August 23, 2023 17:06 11s
Fix: move play tts callback creation Merge Conflict Detection #58: Commit d41fc39 pushed by Bizzonium
August 23, 2023 16:38 11s master220
master220
August 23, 2023 16:38 11s
Disable tutorial Merge Conflict Detection #57: Commit ad15d1b pushed by Dimach
August 17, 2023 17:55 13s master220
master220
August 17, 2023 17:55 13s
Disable tutorial Merge Conflict Detection #56: Commit 5ce8dcd pushed by Dimach
August 17, 2023 17:52 12s master220
master220
August 17, 2023 17:52 12s
Add: kilo station Merge Conflict Detection #55: Commit ef0b496 pushed by Dimach
August 13, 2023 00:09 16s master220
master220
August 13, 2023 00:09 16s
Add: kilo station Merge Conflict Detection #54: Commit 9559cdd pushed by Dimach
August 11, 2023 19:56 13s master220
master220
August 11, 2023 19:56 13s
Add: kilo station Merge Conflict Detection #53: Commit f99851b pushed by Dimach
August 9, 2023 20:55 13s master220
master220
August 9, 2023 20:55 13s
Add: kilo station Merge Conflict Detection #52: Commit 4d1b762 pushed by Dimach
August 6, 2023 23:02 10s master220
master220
August 6, 2023 23:02 10s