Merge master into netstandard

This commit is contained in:
smoogipoo
2017-11-21 16:39:21 +09:00
93 changed files with 761 additions and 425 deletions

View File

@ -210,10 +210,9 @@ namespace osu.Desktop.Overlays
}
}
}
catch (HttpRequestException)
catch (Exception)
{
//likely have no internet connection.
//we'll ignore this and retry later.
// we'll ignore this and retry later. can be triggered by no internet connection or thread abortion.
}
finally
{