Merge remote-tracking branch 'Aergwyn/master' into netstandard

This commit is contained in:
smoogipoo
2017-11-29 23:45:29 +09:00
155 changed files with 2290 additions and 923 deletions

View File

@ -35,6 +35,7 @@ namespace osu.Game.Database
var id = obj.ID;
obj = lookupSource?.SingleOrDefault(t => t.ID == id) ?? context.Find<T>(id);
context.Entry(obj).Reload();
}
/// <summary>