Craftplacer 4e56981554 Merge remote-tracking branch 'upstream/master' into update-button ... # Conflicts: # osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs		2020-06-07 22:43:53 +02:00
..
LanguageSettings.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
LoginSettings.cs	Limit font weight to bold	2020-03-16 16:32:25 -07:00
UpdateSettings.cs	Merge remote-tracking branch 'upstream/master' into update-button	2020-06-07 22:43:53 +02:00