Morb0 e76bb1fa57 Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Datasets/Names/borer.yml # Resources/Prototypes/Datasets/Names/diona.yml # Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json # Resources/Textures/Tiles/plating_burnt.png		2024-12-05 01:22:35 +03:00
..
Whitelist	Automated whitelists (#23985)	2024-08-27 18:01:17 +02:00
ConnectionManager.cs	Merge remote-tracking branch 'wizards/master' into upstream-sync	2024-12-05 01:22:35 +03:00
ConnectionManager.Whitelist.cs	Fix whitelist (#31563)	2024-08-28 17:11:25 +10:00
GrantConnectBypassCommand.cs	Use moderator perms for grant_connect_bypass (#29406)	2024-06-24 23:56:29 +02:00
UserDataExt.cs	Integrate Modern HWID into content	2024-11-12 01:51:54 +01:00