Merge master with conflicts resolved

2025-07-01 16:29:58 +09:00 · 2020-01-30 10:08:02 +03:00
parent d20c48d151 dfd0b1b88c
commit a8578c1526
27 changed files with 205 additions and 143 deletions
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual.Online
            typeof(HeaderButton),
            typeof(SortTabControl),
            typeof(ShowChildrenButton),
-            typeof(DeletedChildrenPlaceholder),
+            typeof(DeletedCommentsCounter),
            typeof(VotePill),
            typeof(CommentsPage),
        };