Merge branch 'master' into editor-exit-stability

This commit is contained in:
Dean Herbert
2021-05-28 14:32:32 +09:00
200 changed files with 4928 additions and 2638 deletions

View File

@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Dialog
},
new PopupDialogCancelButton
{
Text = @"Cancel",
Text = Localisation.CommonStrings.Cancel,
Action = onCancel
},
};