Merge master into netstandard

This commit is contained in:
smoogipoo
2018-01-05 00:42:48 +09:00
parent a8ade26147
commit 36e9232472
141 changed files with 1555 additions and 660 deletions

View File

@ -118,7 +118,7 @@ namespace osu.Desktop.Overlays
// only show a notification if we've previously saved a version to the config file (ie. not the first run).
if (!string.IsNullOrEmpty(lastVersion))
Scheduler.AddDelayed(() => notificationOverlay.Post(new UpdateCompleteNotification(version)), 5000);
notificationOverlay.Post(new UpdateCompleteNotification(version));
}
}