Merge remote-tracking branch 'origin/dev' into dev_lishuo

# Conflicts:
#	Assets/Scripts/App.cs
This commit is contained in:
lishuo committed 2021-04-28 15:49:24 +08:00
commit 614d067d25
39 files changed
+5682 -12276

No files matched your search

@@ -163,5 +163,7 @@ namespace Assets.Scripts.Apis.Models
///
/// </summary>
public string CanShareOnStrava { get; set; }
public string ViewUrl { get; set; }
}
}