Skip to content

Actions: tomaae/homeassistant-mikrotik_router

Actions

Check for PR merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
26 workflow run results
26 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix for ros 7.13 wireless Check for PR merge conflicts #354: Pull request #332 synchronize by slackr31337
December 16, 2023 17:58 36s slackr31337:ros-7.13
slackr31337:ros-7.13
December 16, 2023 17:58 36s
fixed uom for interfaces, fixes #325 Check for PR merge conflicts #352: Commit a61dfa5 pushed by tomaae
December 6, 2023 23:54 34s master
master
December 6, 2023 23:54 34s
black Check for PR merge conflicts #351: Commit 80bae0c pushed by tomaae
November 5, 2023 23:49 36s master
master
November 5, 2023 23:49 36s
Merge pull request #316 from L2jLiga/master Check for PR merge conflicts #350: Commit 593aca5 pushed by tomaae
October 23, 2023 21:21 47s master
master
October 23, 2023 21:21 47s
feat: netwatch binary sensor Check for PR merge conflicts #349: Pull request #316 synchronize by L2jLiga
October 15, 2023 15:16 47s L2jLiga:master
L2jLiga:master
October 15, 2023 15:16 47s
removed forgotten dev print Check for PR merge conflicts #347: Commit 2cdd645 pushed by tomaae
October 6, 2023 00:08 38s master
master
October 6, 2023 00:08 38s
Merge remote-tracking branch 'origin/master' Check for PR merge conflicts #346: Commit 355d16f pushed by tomaae
September 18, 2023 07:53 39s v.2.1.4
v.2.1.4
September 18, 2023 07:53 39s
Merge remote-tracking branch 'origin/master' Check for PR merge conflicts #345: Commit 355d16f pushed by tomaae
September 18, 2023 07:50 42s master
master
September 18, 2023 07:50 42s
Merge pull request #307 from tomaae/lokalise-2023-09-18_09-26-54 Check for PR merge conflicts #344: Commit e5f0e40 pushed by tomaae
September 18, 2023 07:28 36s master
master
September 18, 2023 07:28 36s
Lokalise: Translations update Check for PR merge conflicts #343: Pull request #307 opened by tomaae
September 18, 2023 07:27 39s lokalise-2023-09-18_09-26-54
lokalise-2023-09-18_09-26-54
September 18, 2023 07:27 39s
Lokalise: updates Check for PR merge conflicts #342: Commit 5809d0a pushed by tomaae
September 18, 2023 07:27 35s lokalise-2023-09-18_09-26-54
lokalise-2023-09-18_09-26-54
September 18, 2023 07:27 35s
Merge pull request #296 from tomaae/coordinator Check for PR merge conflicts #341: Commit 380884d pushed by tomaae
September 18, 2023 07:26 42s lokalise-2023-09-18_09-26-54
lokalise-2023-09-18_09-26-54
September 18, 2023 07:26 42s
Merge pull request #296 from tomaae/coordinator Check for PR merge conflicts #340: Commit 380884d pushed by tomaae
September 12, 2023 10:52 39s v2.1.3
v2.1.3
September 12, 2023 10:52 39s
Merge pull request #296 from tomaae/coordinator Check for PR merge conflicts #339: Commit 380884d pushed by tomaae
August 31, 2023 00:54 39s master
master
August 31, 2023 00:54 39s
Coordinator Check for PR merge conflicts #338: Pull request #296 opened by tomaae
August 31, 2023 00:54 52s coordinator
coordinator
August 31, 2023 00:54 52s
rebase Check for PR merge conflicts #337: Commit c872823 pushed by tomaae
August 31, 2023 00:53 39s coordinator
coordinator
August 31, 2023 00:53 39s
cleanup Check for PR merge conflicts #336: Commit e1e9f61 pushed by tomaae
August 10, 2023 00:21 48s coordinator
coordinator
August 10, 2023 00:21 48s
added coordinator for device tracker Check for PR merge conflicts #335: Commit efe3de0 pushed by tomaae
August 9, 2023 21:00 39s coordinator
coordinator
August 9, 2023 21:00 39s
reverted to standard scan interval Check for PR merge conflicts #334: Commit ebee5a3 pushed by tomaae
August 9, 2023 11:56 37s coordinator
coordinator
August 9, 2023 11:56 37s
fixed client traffic sensors Check for PR merge conflicts #333: Commit 04e0d87 pushed by tomaae
August 9, 2023 09:54 43s coordinator
coordinator
August 9, 2023 09:54 43s
fixed "Ignoring invalid device info" error from 2023.8, fixes #292 Check for PR merge conflicts #332: Commit 51c9c62 pushed by tomaae
August 9, 2023 09:33 49s coordinator
coordinator
August 9, 2023 09:33 49s
updated minimum ha version Check for PR merge conflicts #331: Commit 5186956 pushed by tomaae
August 9, 2023 09:03 39s coordinator
coordinator
August 9, 2023 09:03 39s
merged hwinfo and fwupdate_check into main update loop Check for PR merge conflicts #330: Commit c83e735 pushed by tomaae
August 9, 2023 08:54 44s coordinator
coordinator
August 9, 2023 08:54 44s
cleanup Check for PR merge conflicts #329: Commit 7a892b6 pushed by tomaae
August 9, 2023 00:34 45s coordinator
coordinator
August 9, 2023 00:34 45s
coordinator update Check for PR merge conflicts #328: Commit a21e95c pushed by tomaae
August 7, 2023 22:50 35s coordinator
coordinator
August 7, 2023 22:50 35s