Merge branch 'master' into dependabot/npm_and_yarn/eslint-plugin-n-16…

….6.2
elementary · Jan 15, 2024 · 5d2d5c1 · 5d2d5c1
2 parents 0899169 + bbf6da8
commit 5d2d5c1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.28.0
+        uses: shivammathur/setup-php@2.29.0
         with:
           php-version: '8.1'
           tools: composer
@@ -47,7 +47,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.28.0
+        uses: shivammathur/setup-php@2.29.0
         with:
           php-version: 8.1
           tools: composer
@@ -72,7 +72,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.28.0
+        uses: shivammathur/setup-php@2.29.0
         with:
           php-version: 8.1
           tools: composer
@@ -97,7 +97,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.28.0
+        uses: shivammathur/setup-php@2.29.0
         with:
           php-version: 8.1
           tools: composer
@@ -121,7 +121,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.28.0
+        uses: shivammathur/setup-php@2.29.0
         with:
           php-version: 8.1
           tools: composer

diff --git a/.github/workflows/update_translations.yml b/.github/workflows/update_translations.yml
@@ -26,7 +26,7 @@ jobs:
           submodules: true
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@2.28.0
+        uses: shivammathur/setup-php@2.29.0
         with:
           php-version: '8.1'
           tools: composer

diff --git a/_backend/composer.lock b/_backend/composer.lock
diff --git a/_images/icons b/_images/icons
+0 −0		actions/16/media-eject-symbolic.svg
+47 −0		actions/24/media-eject-symbolic.svg