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
..
Migrations	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-03 03:38:29 +03:00
add-migration.ps1	Holy crap auth works (#2099)	2020-09-29 14:26:00 +02:00
add-migration.sh	DB QOL stuff, but not breaking the migrations now (#5086)	2021-10-31 15:18:01 +01:00
Content.Server.Database.csproj	Dependency update / fixes / skrungle bungle (#23745)	2024-01-12 23:22:01 +01:00
DesignTimeContextFactories.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00
Model.cs	Merge remote-tracking branch 'upstream/master' into master-syndie	2024-02-22 13:19:02 +03:00
ModelPostgres.cs	Fix admin notes and database time nonsense. (#25280)	2024-02-20 10:13:31 +01:00
ModelSqlite.cs	Dependency update / fixes / skrungle bungle (#23745)	2024-01-12 23:22:01 +01:00
SnakeCaseNaming.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00