Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,270 workflow runs
4,270 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Translated using Weblate (Japanese) Conflicts #9493: Commit dc67ee1 pushed by weblate
February 24, 2025 06:25 2m 14s development
development
February 24, 2025 06:25 2m 14s
Translated using Weblate (Kurdish (Central)) Conflicts #9492: Commit ea81e72 pushed by weblate
February 24, 2025 03:11 2m 12s development
development
February 24, 2025 03:11 2m 12s
Translated using Weblate (Kurdish (Central)) Conflicts #9491: Commit 4f2af2e pushed by weblate
February 24, 2025 01:12 2m 10s development
development
February 24, 2025 01:12 2m 10s
Translated using Weblate (Czech) Conflicts #9490: Commit 81ab749 pushed by weblate
February 23, 2025 23:13 3m 36s development
development
February 23, 2025 23:13 3m 36s
Update flatpak.yml (#6902) Conflicts #9489: Commit 13ce3ab pushed by PrestonN
February 23, 2025 23:11 4m 15s development
development
February 23, 2025 23:11 4m 15s
Update flatpak.yml (#6903) Conflicts #9488: Commit ed14122 pushed by PrestonN
February 23, 2025 23:11 10s master
master
February 23, 2025 23:11 10s
Migrate stylelintrc to stylint.config.js (#6871) Conflicts #9487: Commit 81e89e7 pushed by FreeTubeBot
February 23, 2025 23:10 2m 16s development
development
February 23, 2025 23:10 2m 16s
Reduce repeated code in secondary theme colours Conflicts #9486: Pull request #6505 synchronize by absidue
February 23, 2025 21:55 11s
February 23, 2025 21:55 11s
Update flatpak.yml Conflicts #9485: Commit 42199b1 pushed by PrestonN
February 23, 2025 21:35 10s Flatpak-Build-Fix-Master
Flatpak-Build-Fix-Master
February 23, 2025 21:35 10s
Update flatpak.yml Conflicts #9484: Commit 467044d pushed by PrestonN
February 23, 2025 21:31 11s Flatpak-Build-Fix
Flatpak-Build-Fix
February 23, 2025 21:31 11s
Merge branch 'origin/development' into Weblate. Conflicts #9483: Commit ecdc081 pushed by weblate
February 23, 2025 21:26 12s development
development
February 23, 2025 21:26 12s
Add Everforest color themes (#6468) Conflicts #9482: Commit 2a193a7 pushed by FreeTubeBot
February 23, 2025 21:26 2m 14s development
development
February 23, 2025 21:26 2m 14s
Add icons to page headers + subscription tabs (#6669) Conflicts #9481: Commit 2f53c9d pushed by FreeTubeBot
February 23, 2025 21:23 2m 13s development
development
February 23, 2025 21:23 2m 13s
Translated using Weblate (Dutch) Conflicts #9480: Commit 8983ff5 pushed by weblate
February 23, 2025 20:09 2m 15s development
development
February 23, 2025 20:09 2m 15s
Merge pull request #6883 from kommunarr/master Conflicts #9479: Commit 7289c57 pushed by PrestonN
February 23, 2025 19:32 11s v0.23.2-beta
v0.23.2-beta
February 23, 2025 19:32 11s
Merge pull request #6883 from kommunarr/master Conflicts #9478: Commit 7289c57 pushed by kommunarr
February 23, 2025 19:03 12s master
master
February 23, 2025 19:03 12s
Update package.json (#6898) Conflicts #9477: Commit 3f262f5 pushed by FreeTubeBot
February 23, 2025 15:48 2m 12s development
development
February 23, 2025 15:48 2m 12s
Translated using Weblate (Norwegian Bokmål) Conflicts #9476: Commit f920840 pushed by weblate
February 23, 2025 13:09 2m 13s development
development
February 23, 2025 13:09 2m 13s
Update package.json Conflicts #9475: Commit 86ad06b pushed by PikachuEXE
February 23, 2025 11:31 11s PikachuEXE-patch-1
PikachuEXE-patch-1
February 23, 2025 11:31 11s
Translated using Weblate (Azerbaijani) Conflicts #9474: Commit f0de199 pushed by weblate
February 23, 2025 10:10 2m 16s development
development
February 23, 2025 10:10 2m 16s
Remove fallback to Array.from (#6830) Conflicts #9473: Commit d270c9e pushed by FreeTubeBot
February 23, 2025 05:10 2m 16s development
development
February 23, 2025 05:10 2m 16s
Fix Matrix urls (#6891) Conflicts #9472: Commit 9d44c40 pushed by FreeTubeBot
February 23, 2025 01:01 2m 11s development
development
February 23, 2025 01:01 2m 11s
Remove fallback to Array.from Conflicts #9471: Pull request #6830 synchronize by efb4f5ff-1298-471a-8973-3d47447115dc
February 23, 2025 00:02 9s
February 23, 2025 00:02 9s
Translated using Weblate (Hungarian) Conflicts #9470: Commit 9001a2d pushed by weblate
February 22, 2025 15:55 2m 10s development
development
February 22, 2025 15:55 2m 10s
Bump the eslint group with 4 updates (#6864) Conflicts #9469: Commit 977d550 pushed by FreeTubeBot
February 22, 2025 07:50 2m 14s development
development
February 22, 2025 07:50 2m 14s