Skip to content
Commit 3dd60dc7 authored by Marek Vrbka's avatar Marek Vrbka
Browse files

Merge branch 'master' into '15-formatted-text' 

# Conflicts:
#   StockAdvisory.Tests/StockParserTests.cs
parents 9e7946ac 795e0105