Skip to content

Actions: MarmadileManteater/FreeTubeAndroid

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
663 workflow runs
663 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Map back nav button to history.back and otherwise app close Conflicts #797: Commit 770d383 pushed by MarmadileManteater
January 29, 2024 16:31 12s android
android
January 29, 2024 16:31 12s
Bump sass from 1.69.3 to 1.69.7 Conflicts #796: Commit 26de83b pushed by dependabot bot
January 8, 2024 20:29 9s dependabot/npm_and_yarn/sass-1.69.7
dependabot/npm_and_yarn/sass-1.69.7
January 8, 2024 20:29 9s
Bump the eslint group with 10 updates Conflicts #795: Commit 43d598b pushed by dependabot bot
January 8, 2024 20:29 10s dependabot/npm_and_yarn/eslint-411d435ce7
dependabot/npm_and_yarn/eslint-411d435ce7
January 8, 2024 20:29 10s
Bump the babel group with 3 updates Conflicts #794: Commit c328215 pushed by dependabot bot
January 8, 2024 20:28 13s dependabot/npm_and_yarn/babel-5a05e8f7b8
dependabot/npm_and_yarn/babel-5a05e8f7b8
January 8, 2024 20:28 13s
Bump electron from 22.3.26 to 28.1.1 Conflicts #793: Commit cc1064d pushed by dependabot bot
January 8, 2024 20:27 13s dependabot/npm_and_yarn/electron-28.1.1
dependabot/npm_and_yarn/electron-28.1.1
January 8, 2024 20:27 13s
Bump the babel group with 3 updates Conflicts #792: Commit 8d32b0b pushed by dependabot bot
January 1, 2024 20:44 11s dependabot/npm_and_yarn/babel-570f5c4984
dependabot/npm_and_yarn/babel-570f5c4984
January 1, 2024 20:44 11s
Bump youtubei.js from 6.4.1 to 8.1.0 Conflicts #791: Commit 32d40a0 pushed by dependabot bot
January 1, 2024 20:37 11s dependabot/npm_and_yarn/youtubei.js-8.1.0
dependabot/npm_and_yarn/youtubei.js-8.1.0
January 1, 2024 20:37 11s
Bump vue-loader from 15.10.0 to 17.4.2 Conflicts #790: Commit 5c59214 pushed by dependabot bot
January 1, 2024 20:36 13s dependabot/npm_and_yarn/vue-loader-17.4.2
dependabot/npm_and_yarn/vue-loader-17.4.2
January 1, 2024 20:36 13s
Bump the eslint group with 9 updates Conflicts #789: Commit 04a5b2b pushed by dependabot bot
January 1, 2024 20:34 11s dependabot/npm_and_yarn/eslint-72624377fc
dependabot/npm_and_yarn/eslint-72624377fc
January 1, 2024 20:34 11s
Bump the stylelint group with 6 updates Conflicts #788: Commit 40866bf pushed by dependabot bot
January 1, 2024 20:34 14s dependabot/npm_and_yarn/stylelint-8bbf541824
dependabot/npm_and_yarn/stylelint-8bbf541824
January 1, 2024 20:34 14s
Bump sass from 1.69.3 to 1.69.6 Conflicts #787: Commit 4a57c34 pushed by dependabot bot
January 1, 2024 20:33 11s dependabot/npm_and_yarn/sass-1.69.6
dependabot/npm_and_yarn/sass-1.69.6
January 1, 2024 20:33 11s
Bump the eslint group with 9 updates Conflicts #786: Commit d0b4419 pushed by dependabot bot
December 25, 2023 20:54 10s dependabot/npm_and_yarn/eslint-995cfe4f61
dependabot/npm_and_yarn/eslint-995cfe4f61
December 25, 2023 20:54 10s
Bump vue-loader from 15.10.0 to 17.4.0 Conflicts #785: Commit b19a50e pushed by dependabot bot
December 25, 2023 20:51 9s dependabot/npm_and_yarn/vue-loader-17.4.0
dependabot/npm_and_yarn/vue-loader-17.4.0
December 25, 2023 20:51 9s
Bump the stylelint group with 4 updates Conflicts #784: Commit c5d3010 pushed by dependabot bot
December 25, 2023 20:50 10s dependabot/npm_and_yarn/stylelint-7a935574c6
dependabot/npm_and_yarn/stylelint-7a935574c6
December 25, 2023 20:50 10s
Bump electron from 22.3.26 to 28.1.0 Conflicts #783: Commit d90211a pushed by dependabot bot
December 25, 2023 20:49 16s dependabot/npm_and_yarn/electron-28.1.0
dependabot/npm_and_yarn/electron-28.1.0
December 25, 2023 20:49 16s
Bump the eslint group with 8 updates Conflicts #782: Commit 351a9aa pushed by dependabot bot
December 18, 2023 20:37 9s dependabot/npm_and_yarn/eslint-41efc7cbe3
dependabot/npm_and_yarn/eslint-41efc7cbe3
December 18, 2023 20:37 9s
Bump the stylelint group with 4 updates Conflicts #781: Commit 3c542e1 pushed by dependabot bot
December 18, 2023 20:35 11s dependabot/npm_and_yarn/stylelint-836c6d9453
dependabot/npm_and_yarn/stylelint-836c6d9453
December 18, 2023 20:35 11s
Bump the fortawesome group with 4 updates Conflicts #780: Pull request #265 synchronize by dependabot bot
December 18, 2023 20:34 12s
December 18, 2023 20:34 12s
Bump the fortawesome group with 4 updates Conflicts #779: Commit 482cf7e pushed by dependabot bot
December 18, 2023 20:34 14s dependabot/npm_and_yarn/fortawesome-a37ef859ae
dependabot/npm_and_yarn/fortawesome-a37ef859ae
December 18, 2023 20:34 14s
Bump the babel group with 3 updates Conflicts #778: Pull request #273 synchronize by dependabot bot
December 18, 2023 20:34 15s
December 18, 2023 20:34 15s
Bump the babel group with 3 updates Conflicts #777: Commit 08cbc9c pushed by dependabot bot
December 18, 2023 20:34 16s dependabot/npm_and_yarn/babel-9729791742
dependabot/npm_and_yarn/babel-9729791742
December 18, 2023 20:34 16s
Fix 🎥live streams on android Conflicts #776: Commit 636f570 pushed by MarmadileManteater
December 11, 2023 21:46 2m 12s development
development
December 11, 2023 21:46 2m 12s
Bump prettier from 2.8.8 to 3.1.1 Conflicts #775: Commit 4c4e4aa pushed by dependabot bot
December 11, 2023 20:25 18s dependabot/npm_and_yarn/prettier-3.1.1
dependabot/npm_and_yarn/prettier-3.1.1
December 11, 2023 20:25 18s
Bump electron from 22.3.26 to 28.0.0 Conflicts #774: Commit b300cb8 pushed by dependabot bot
December 11, 2023 20:24 10s dependabot/npm_and_yarn/electron-28.0.0
dependabot/npm_and_yarn/electron-28.0.0
December 11, 2023 20:24 10s
Bump the eslint group with 6 updates Conflicts #773: Commit 97ba28e pushed by dependabot bot
December 11, 2023 20:21 12s dependabot/npm_and_yarn/eslint-1796c550ff
dependabot/npm_and_yarn/eslint-1796c550ff
December 11, 2023 20:21 12s
ProTip! You can narrow down the results and go further in time using created:<2023-12-11 or the other filters available.