CatStation/Content.Client/Preferences/UI
Arthur fb4739aeab Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/species.yml
#	Resources/Server Info/Rules.txt
#	Resources/Textures/Tiles/dark.png
#	Resources/Textures/Tiles/steel.png
#	Resources/Textures/Tiles/white.png
2022-03-13 21:51:12 +03:00
..
CharacterSetupGui.xaml Fix rider errors with style classes. 2021-10-30 14:00:46 +02:00
CharacterSetupGui.xaml.cs Seal/abstract/virtual everything (#6739) 2022-02-16 18:23:23 +11:00
HumanoidProfileEditor.Random.cs Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-02-17 01:05:48 +03:00
HumanoidProfileEditor.xaml Upstream species (#6066) 2022-01-08 19:53:14 -06:00
HumanoidProfileEditor.xaml.cs Fix non-roundstart species showing up... at roundstart (#7108) 2022-03-14 02:42:07 +11:00