Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	squad-server/log-parser/player-disconnected.js
This commit is contained in:
Skillet 2023-11-02 00:52:43 -04:00
commit 9ae38a0e0c

View File

@ -1,6 +1,6 @@
{ {
"name": "SquadJS", "name": "SquadJS",
"version": "3.8.0", "version": "3.8.1",
"repository": "https://github.com/Team-Silver-Sphere/SquadJS.git", "repository": "https://github.com/Team-Silver-Sphere/SquadJS.git",
"author": "Thomas Smyth <https://github.com/Thomas-Smyth>", "author": "Thomas Smyth <https://github.com/Thomas-Smyth>",
"license": "BSL-1.0", "license": "BSL-1.0",