smoogipoo 9924f518b7 Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore ... # Conflicts: # osu-framework # osu.Game/Beatmaps/BeatmapMetadata.cs # osu.Game/osu.Game.csproj # osu.Game/packages.config		2017-10-14 16:36:37 +09:00
..
Beatmaps	And then everything became one	2017-09-19 16:06:58 +09:00
Platform	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
Visual	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore	2017-10-14 16:36:37 +09:00