Morb0 4ee0df9498 Merge remote-tracking branch 'upstream/master' into master-syndie ... # Conflicts: # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Catalog/Fills/Lockers/heads.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Structures/stairs.rsi/meta.json # Resources/Textures/Structures/stairs.rsi/stairs.png # Resources/Textures/Structures/stairs.rsi/stairs_stage.png		2024-02-22 13:19:02 +03:00
..
DatabaseRecords.cs	Fix admin notes and database time nonsense. (#25280)	2024-02-20 10:13:31 +01:00
ServerBanDef.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
ServerDbBase.cs	Merge remote-tracking branch 'upstream/master' into master-syndie	2024-02-22 13:19:02 +03:00
ServerDbEntryManager.cs	Log server ID in connection logs table (#21911)	2023-12-07 09:48:56 +11:00
ServerDbManager.cs	Fix admin notes and database time nonsense. (#25280)	2024-02-20 10:13:31 +01:00
ServerDbPostgres.cs	Fix admin notes and database time nonsense. (#25280)	2024-02-20 10:13:31 +01:00
ServerDbSqlite.cs	Fix admin notes and database time nonsense. (#25280)	2024-02-20 10:13:31 +01:00
ServerRoleBanDef.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
ServerRoleUnbanDef.cs	Role bans (#6703)	2022-02-21 23:11:39 +01:00
ServerUnbanDef.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00
UserDbDataManager.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00