Merge branch 'development' of github.com:FreeTubeApp/FreeTube into fe…

…at/add-settings-menu
FreeTubeApp · May 22, 2024 · dcdd170 · dcdd170
2 parents 31112da + 8a82abe
commit dcdd170
Show file tree

Hide file tree

Showing 85 changed files with 2,679 additions and 1,033 deletions.
diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: check if prs are dirty
-        uses: eps1lon/actions-label-merge-conflict@releases/2.x
+        uses: eps1lon/actions-label-merge-conflict@v3
         with:
           dirtyLabel: "PR: merge conflicts / rebase needed"
           removeOnDirtyLabel: "PR: waiting for review"

diff --git a/_icons/iconSolarizedDarkSmall.svg b/_icons/iconSolarizedDarkSmall.svg
diff --git a/_icons/iconSolarizedLightSmall.svg b/_icons/iconSolarizedLightSmall.svg
diff --git a/_icons/textSolarizedDarkSmall.svg b/_icons/textSolarizedDarkSmall.svg
diff --git a/_icons/textSolarizedLightSmall.svg b/_icons/textSolarizedLightSmall.svg