Morb0 d97a09543d Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Client/IoC/ClientContentIoC.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/RoleLoadout.cs # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json		2024-05-15 18:53:52 +03:00
..
DatabaseRecords.cs	Fix database round start date issues (#26838)	2024-04-14 07:39:43 +02:00
ServerBanDef.cs	Better notes and bans (#14228)	2023-07-21 13:38:52 +02:00
ServerDbBase.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-15 18:53:52 +03:00
ServerDbEntryManager.cs	Log server ID in connection logs table (#21911)	2023-12-07 09:48:56 +11:00
ServerDbManager.cs	Fix preference loading bugs (#27742)	2024-05-07 14:21:03 +10:00
ServerDbPostgres.cs	Fix preference loading bugs (#27742)	2024-05-07 14:21:03 +10:00
ServerDbSqlite.cs	Fix preference loading bugs (#27742)	2024-05-07 14:21:03 +10: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	Fix preferences sent to client not being sanitized (#27789)	2024-05-08 04:24:54 +02:00