Skip to content

Actions: MarmadileManteater/FreeTubeAndroid

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
661 workflow runs
661 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump electron from 34.0.1 to 34.0.2 Conflicts #1420: Commit ecf3ade pushed by dependabot bot
February 3, 2025 20:54 11s dependabot/npm_and_yarn/electron-34.0.2
dependabot/npm_and_yarn/electron-34.0.2
February 3, 2025 20:54 11s
Bump swiper from 11.2.1 to 11.2.2 Conflicts #1419: Commit 6ef07b9 pushed by dependabot bot
February 3, 2025 20:54 10s dependabot/npm_and_yarn/swiper-11.2.2
dependabot/npm_and_yarn/swiper-11.2.2
February 3, 2025 20:54 10s
Bump @fortawesome/vue-fontawesome from 2.0.10 to 3.0.8 in the fortawesome group across 1 directory Conflicts #1418: Pull request #465 synchronize by dependabot bot
February 3, 2025 20:54 11s
February 3, 2025 20:54 11s
Bump @fortawesome/vue-fontawesome Conflicts #1417: Commit afe8a2f pushed by dependabot bot
February 3, 2025 20:54 11s dependabot/npm_and_yarn/fortawesome-f70136e5e6
dependabot/npm_and_yarn/fortawesome-f70136e5e6
February 3, 2025 20:54 11s
**Release 0.23.1.10** Conflicts #1416: Commit 9791c4c pushed by MarmadileManteater
February 1, 2025 04:07 13s 0.23.1.11
0.23.1.11
February 1, 2025 04:07 13s
**Release 0.23.1.10** Conflicts #1415: Commit 9791c4c pushed by MarmadileManteater
February 1, 2025 04:00 11s release
release
February 1, 2025 04:00 11s
Change header on release script Conflicts #1414: Commit 2095543 pushed by MarmadileManteater
February 1, 2025 03:44 2m 10s development
development
February 1, 2025 03:44 2m 10s
**Release 0.23.1.10** Conflicts #1413: Commit 092a504 pushed by MarmadileManteater
February 1, 2025 03:42 12s release
release
February 1, 2025 03:42 12s
Add back missing ref Conflicts #1412: Commit 43b33aa pushed by MarmadileManteater
February 1, 2025 01:58 11s fix-search-not-working-on-mobile
fix-search-not-working-on-mobile
February 1, 2025 01:58 11s
Fix search not working because of undefined ref Conflicts #1411: Commit 93b60b7 pushed by MarmadileManteater
February 1, 2025 01:51 14s fix-search-not-working-on-mobile
fix-search-not-working-on-mobile
February 1, 2025 01:51 14s
Merge commit 'bfa22f49b664ea45acb6601a7060fa208e235548' into development Conflicts #1410: Commit deb72fe pushed by MarmadileManteater
January 31, 2025 13:17 2m 18s development
development
January 31, 2025 13:17 2m 18s
Ignore linting results Conflicts #1409: Commit afcb50d pushed by MarmadileManteater
January 31, 2025 04:58 11s 0.23.0.9
0.23.0.9
January 31, 2025 04:58 11s
Ignore linting results Conflicts #1408: Commit afcb50d pushed by MarmadileManteater
January 31, 2025 04:44 11s release
release
January 31, 2025 04:44 11s
**Release 0.23.0.12** Conflicts #1407: Commit 02aec90 pushed by MarmadileManteater
January 31, 2025 04:42 13s release
release
January 31, 2025 04:42 13s
**Release 0.23.0.12** Conflicts #1406: Commit b9636e6 pushed by MarmadileManteater
January 31, 2025 04:41 14s release
release
January 31, 2025 04:41 14s
Update yarn lock Conflicts #1405: Commit 44c18c1 pushed by MarmadileManteater
January 31, 2025 04:33 2m 15s development
development
January 31, 2025 04:33 2m 15s
Merge commit '2223fff4df2b4ee19b70854ffad15c6e3902b497' into development Conflicts #1404: Commit fd78af2 pushed by MarmadileManteater
January 31, 2025 04:30 2m 15s development
development
January 31, 2025 04:30 2m 15s
Remove deprecated dontation methods in README.md Conflicts #1403: Commit 2223fff pushed by MarmadileManteater
January 31, 2025 04:25 2m 16s development
development
January 31, 2025 04:25 2m 16s
adjust about page margins Conflicts #1402: Commit e57b1f3 pushed by MarmadileManteater
January 31, 2025 04:22 2m 12s development
development
January 31, 2025 04:22 2m 12s
Merge remote-tracking branch 'origin/development' into development Conflicts #1401: Commit 2f8692d pushed by MarmadileManteater
January 31, 2025 04:16 2m 11s development
development
January 31, 2025 04:16 2m 11s
Update buildCordova.yml Conflicts #1400: Commit 65589fe pushed by MarmadileManteater
January 31, 2025 03:38 2m 14s development
development
January 31, 2025 03:38 2m 14s
Merge upstream Conflicts #1399: Commit 7f585e6 pushed by MarmadileManteater
January 31, 2025 03:36 2m 11s development
development
January 31, 2025 03:36 2m 11s
fix discrepancy Conflicts #1398: Commit 386785e pushed by MarmadileManteater
January 31, 2025 03:23 10s composition/ft-slider
composition/ft-slider
January 31, 2025 03:23 10s
Use $t Conflicts #1397: Commit f52cfc1 pushed by MarmadileManteater
January 31, 2025 03:22 12s composition/ft-slider
composition/ft-slider
January 31, 2025 03:22 12s
Fix web webpack config Conflicts #1396: Commit ff01223 pushed by MarmadileManteater
January 31, 2025 03:18 12s composition/ft-slider
composition/ft-slider
January 31, 2025 03:18 12s