merge dev into main

This commit is contained in:
gabrielkheisa
2024-04-07 16:03:01 +07:00
3 changed files with 66 additions and 21 deletions

View File

@@ -17,4 +17,8 @@ jobs:
uses: actions/checkout@v2
- name: Build Docker image
<<<<<<< HEAD
run: docker build -t discord-badge .
=======
run: docker build -t discord-badge .
>>>>>>> dev