Morb0 28edee0fe2 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Administration/Commands/AdminWhoCommand.cs # Content.Server/Administration/Commands/PlayTimeCommands.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml		2024-06-01 23:06:19 +03:00
..
Migrations	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-06-01 23:06:19 +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	Switch project files to C# 12. (#25487)	2024-02-23 15:02:59 +11:00
DesignTimeContextFactories.cs	Server ban exemption system (#15076)	2023-04-03 10:24:55 +10:00
Model.cs	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-06-01 23:06:19 +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	Fix EFCore obsoletion warnings in Content.Server.Database (#26285)	2024-03-20 15:47:36 +01:00