Skip to content

Actions: FreeTubeApp/FreeTube-Docs

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
151 workflow runs
151 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update README.md Conflicts #503: Commit 2bf6c7b pushed by efb4f5ff-1298-471a-8973-3d47447115dc
December 2, 2024 20:05 9s update-macos-version
update-macos-version
December 2, 2024 20:05 9s
Update about-freetube.md Conflicts #502: Commit 4697768 pushed by efb4f5ff-1298-471a-8973-3d47447115dc
December 2, 2024 20:05 12s update-macos-version
update-macos-version
December 2, 2024 20:05 12s
Bump rexml from 3.3.7 to 3.3.9 (#152) Conflicts #501: Commit b1d5cb0 pushed by efb4f5ff-1298-471a-8973-3d47447115dc
December 2, 2024 20:01 12s update-macos-version
update-macos-version
December 2, 2024 20:01 12s
Bump rexml from 3.3.7 to 3.3.9 (#152) Conflicts #500: Commit b1d5cb0 pushed by FreeTubeBot
October 28, 2024 19:22 11s master
master
October 28, 2024 19:22 11s
Bump rexml from 3.3.7 to 3.3.9 Conflicts #499: Commit a6ab132 pushed by dependabot bot
October 28, 2024 18:55 11s dependabot/bundler/rexml-3.3.9
dependabot/bundler/rexml-3.3.9
October 28, 2024 18:55 11s
Update matrix rules (#151) Conflicts #498: Commit 9c8a181 pushed by FreeTubeBot
October 23, 2024 06:38 11s master
master
October 23, 2024 06:38 11s
Update matrix rules Conflicts #497: Pull request #151 synchronize by efb4f5ff-1298-471a-8973-3d47447115dc
October 23, 2024 01:25 11s
October 23, 2024 01:25 11s
Update community/matrix.md Conflicts #496: Commit fbf870a pushed by efb4f5ff-1298-471a-8973-3d47447115dc
October 23, 2024 01:25 13s efb4f5ff-1298-471a-8973-3d47447115dc-patch-1
efb4f5ff-1298-471a-8973-3d47447115dc-patch-1
October 23, 2024 01:25 13s
Update matrix rules Conflicts #495: Commit 5b965de pushed by efb4f5ff-1298-471a-8973-3d47447115dc
October 22, 2024 20:03 10s efb4f5ff-1298-471a-8973-3d47447115dc-patch-1
efb4f5ff-1298-471a-8973-3d47447115dc-patch-1
October 22, 2024 20:03 10s
Updates after the shaka-player migration (#135) Conflicts #494: Commit 0044372 pushed by FreeTubeBot
October 19, 2024 13:05 11s master
master
October 19, 2024 13:05 11s
Add subscription-cache.db to the Data Location page (#143) Conflicts #493: Commit dbfcca3 pushed by FreeTubeBot
October 19, 2024 12:33 2m 13s master
master
October 19, 2024 12:33 2m 13s
Bump webrick from 1.8.1 to 1.8.2 (#149) Conflicts #492: Commit 1a2c4af pushed by FreeTubeBot
October 19, 2024 12:32 2m 11s master
master
October 19, 2024 12:32 2m 11s
Bump webrick from 1.8.1 to 1.8.2 Conflicts #491: Commit e14c2b4 pushed by dependabot bot
October 7, 2024 03:50 10s dependabot/bundler/webrick-1.8.2
dependabot/bundler/webrick-1.8.2
October 7, 2024 03:50 10s
Bump jekyll from 4.3.3 to 4.3.4 (#148) Conflicts #490: Commit 2dc812e pushed by FreeTubeBot
October 7, 2024 03:49 2m 12s master
master
October 7, 2024 03:49 2m 12s
Bump jekyll from 4.3.3 to 4.3.4 Conflicts #489: Commit a4b3446 pushed by dependabot bot
September 23, 2024 03:22 17s dependabot/bundler/jekyll-4.3.4
dependabot/bundler/jekyll-4.3.4
September 23, 2024 03:22 17s
Bump google-protobuf from 4.28.1 to 4.28.2 (#147) Conflicts #488: Commit 848fa90 pushed by FreeTubeBot
September 19, 2024 17:01 2m 16s master
master
September 19, 2024 17:01 2m 16s
Bump google-protobuf from 4.28.1 to 4.28.2 Conflicts #487: Commit f8bae74 pushed by dependabot bot
September 19, 2024 16:07 13s dependabot/bundler/google-protobuf-4.28.2
dependabot/bundler/google-protobuf-4.28.2
September 19, 2024 16:07 13s
Bump minima from 2.5.1 to 2.5.2 (#144) Conflicts #486: Commit 2449ded pushed by FreeTubeBot
September 16, 2024 19:20 2m 12s master
master
September 16, 2024 19:20 2m 12s
Bump minima from 2.5.1 to 2.5.2 Conflicts #485: Pull request #144 synchronize by dependabot bot
September 16, 2024 11:14 1m 20s
September 16, 2024 11:14 1m 20s
Bump minima from 2.5.1 to 2.5.2 Conflicts #484: Commit a19d7e2 pushed by dependabot bot
September 16, 2024 11:14 1m 12s dependabot/bundler/minima-2.5.2
dependabot/bundler/minima-2.5.2
September 16, 2024 11:14 1m 12s
Bump peter-evans/create-pull-request from 6 to 7 (#145) Conflicts #483: Commit 30325ea pushed by FreeTubeBot
September 16, 2024 11:12 1m 43s master
master
September 16, 2024 11:12 1m 43s
Bump just-the-docs from 0.9.0 to 0.10.0 (#146) Conflicts #482: Commit d6e25ac pushed by FreeTubeBot
September 16, 2024 11:11 3m 34s master
master
September 16, 2024 11:11 3m 34s
Bump just-the-docs from 0.9.0 to 0.10.0 Conflicts #481: Commit 2271ca5 pushed by dependabot bot
September 16, 2024 03:44 10s dependabot/bundler/just-the-docs-0.10.0
dependabot/bundler/just-the-docs-0.10.0
September 16, 2024 03:44 10s
Bump peter-evans/create-pull-request from 6 to 7 Conflicts #480: Commit 42a89e9 pushed by dependabot bot
September 9, 2024 03:34 10s dependabot/github_actions/peter-evans/create-pull-request-7
dependabot/github_actions/peter-evans/create-pull-request-7
September 9, 2024 03:34 10s
Bump minima from 2.5.1 to 2.5.2 Conflicts #479: Commit a31dbaf pushed by dependabot bot
September 9, 2024 03:21 13s dependabot/bundler/minima-2.5.2
dependabot/bundler/minima-2.5.2
September 9, 2024 03:21 13s