]> git.smokeofanarchy.ru Git - space-station-14.git/commit
projects / space-station-14.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e85bc1b) | patch
P0 BUGFIX: Master doesn't build because of uncaught git merge conflict. (#39116)
authorPrincess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com>
Mon, 21 Jul 2025 18:20:39 +0000 (11:20 -0700)
committerGitHub <noreply@github.com>
Mon, 21 Jul 2025 18:20:39 +0000 (14:20 -0400)
commited6ed6c5f3c0e96eff44c583c8fa9e151df9f9f0
tree6f511b09d4f019d51584d475a2480fcc7b1c43b1tree | snapshot
parente85bc1bb8c58152f209c4fda9620744bff2096b2commit | diff
P0 BUGFIX: Master doesn't build because of uncaught git merge conflict. (#39116)

Quick before someone notices

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Content.Shared/Bed/Sleep/SleepingSystem.cs diff | blob | history
Форк Space Station 14 с переводами на русский