Sergey Borodachev 3f784d7949 Merge branch 'develop' into feature/config_grow_when_merged
# Conflicts:
#	src/Ocelot/DependencyInjection/ConfigurationBuilderExtensions.cs
#	test/Ocelot.UnitTests/DependencyInjection/ConfigurationBuilderExtensionsTests.cs
2018-08-18 05:11:35 +04:00
..
2018-07-20 22:32:40 +01:00