Commit cd17ffe

kgrudzien

committed

Merge remote-tracking branch 'remotes/origin/master' into SDKConsoleApp

# Conflicts: # data-api/csharp-ws/CoinAPI.WebSocket.Stats.Console/Program.cs

2 parents 635fbf0 + 8450bd4 commit cd17ffeCopy full SHA for cd17ffe

4 files changed

+179

-163

lines changed

.gitignore
data-api/csharp-ws
- CoinAPI.WebSocket.Stats.Console
  - Program.cs
  - README.md
- CoinAPI.WebSocket.V1
  - CoinApiWsClient.cs

4 files changed

+179

-163

lines changed

`‎.gitignore`

-Original file line number
+Diff line change
 **/target
 # Visual Studo 2015 cache/options directory
 -.vs/
 +.vs/
++
 +**/appsettings.json

Comments

(0)