Merge branch 'master' into bugfix/wheels_visibility

FileEX · Aug 15, 2023 · 192a97d · 192a97d
2 parents b433e5a + 41934d0
commit 192a97d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/sync-master-to-maetro.yaml b/.github/workflows/sync-master-to-maetro.yaml
@@ -18,7 +18,7 @@ jobs:
         name: Sync commits
         run: |
           # GitHub Actions bot user
-          git config --global user.name "Mætro Bot"
+          git config --global user.name "Maetro Bot"
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
 
           git checkout release/maetro

diff --git a/Server/mods/deathmatch/mtaserver.conf b/Server/mods/deathmatch/mtaserver.conf
@@ -285,6 +285,7 @@
     <resource src="resourcebrowser" startup="1" protected="1" default="true"/>
     <resource src="resourcemanager" startup="1" protected="1"/>
     <resource src="scoreboard" startup="1" protected="0"/>
+    <resource src="speedometer" startup="1" protected="0"/>
     <resource src="spawnmanager" startup="1" protected="0"/>
     <resource src="voice" startup="1" protected="0" />
     <resource src="votemanager" startup="1" protected="0"/>