Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Первый апстрим с мержконфликтом (просто смотрю ошибки) #60

Closed
wants to merge 20 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Automatic changelog update
IanComradeBot committed Nov 11, 2024
commit 20c049a48a6ec3e98b2f6f06da34b36878678326
15 changes: 8 additions & 7 deletions Resources/Changelog/ChangelogSyndie.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
Entries:
- author: Morty
changes:
- message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0441\u043F\u0440\u0430\
\u0439\u0442\u044B \u043A\u043E\u0440\u043E\u0431\u043E\u043A"
type: Tweak
id: 193
time: '2022-07-23T09:50:42.0000000+00:00'
- author: Morty
changes:
- message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u043F\
@@ -4516,3 +4509,11 @@
id: 692
time: '2024-11-11T00:35:09.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2740
- author: Dezzzix
changes:
- message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043D\u043E\u0432\u044B\
\u0439 \u0430\u0440\u0442 \u0432 \u043B\u043E\u0431\u0431\u0438"
type: Add
id: 693
time: '2024-11-11T14:13:54.0000000+00:00'
url: https://github.com/space-syndicate/space-station-14/pull/2762