Merge branch 'nh-server:main' into patch-11

nh-server · Aug 4, 2024 · b4a37ac · b4a37ac
2 parents 0737021 + 6b3d1f5
commit b4a37ac
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -92,7 +92,7 @@ jobs:
           webhook_token: ${{ secrets.WEBHOOK_TOKEN }}
           message: Pulling on server
       - name: Pull on server
-        run: docker-compose -f docker-compose-prod.yml pull
+        run: docker compose -f docker-compose-prod.yml pull
         env:
           DOCKER_HOST: ${{ secrets.SSH_HOST }}
           COMPOSE_PARAMIKO_SSH: '1'

diff --git a/cogs/assistance-cmds/transfersd.3ds.md b/cogs/assistance-cmds/transfersd.3ds.md
@@ -9,5 +9,5 @@ First, ensure the new SD card is in the FAT32 format.
 If it is not in the FAT32 format, follow the intructions here to format it:
 https://wiki.hacks.guide/wiki/Formatting_an_SD_card
 
-Once the new card is in FAT32, move all your content from the old SD to the new SD.
+Once the new card is FAT32, move all your content from the old SD to the new SD.
 IMPORTANT: Do not put the new SD card in the console before moving all your data to it.
diff --git a/cogs/assistance-cmds/transfersd.wiiu.md b/cogs/assistance-cmds/transfersd.wiiu.md
@@ -9,4 +9,4 @@ First, ensure the new SD card is in the FAT32 format.
 If it is not in the FAT32 format, follow the intructions here to format it:
 https://wiki.hacks.guide/wiki/Formatting_an_SD_card
 
-Once the new card is in FAT32, move all your content from the old SD to the new SD.
+Once the new card is FAT32, move all your content from the old SD to the new SD.