Skip to content

Actions: MarmadileManteater/FreeTubeAndroid

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
664 workflow runs
664 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

**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
Migrate ft-slider to the composition api Conflicts #1395: Commit f629f2f pushed by MarmadileManteater
January 31, 2025 02:57 10s composition/ft-slider
composition/ft-slider
January 31, 2025 02:57 10s
use useI18n Conflicts #1394: Commit d8398f0 pushed by MarmadileManteater
January 31, 2025 02:52 13s composition/ft-slider
composition/ft-slider
January 31, 2025 02:52 13s
Migrate ft-slider to compisition api Conflicts #1393: Commit 4ad0cbc pushed by MarmadileManteater
January 31, 2025 02:47 12s composition/ft-slider
composition/ft-slider
January 31, 2025 02:47 12s
Move youtube domains from magic strings to resources file Conflicts #1392: Commit 63171f2 pushed by MarmadileManteater
January 30, 2025 12:58 11s move-context-out-of-js-interface
move-context-out-of-js-interface
January 30, 2025 12:58 11s