Philip Wood 28a41b21a4 Merge remote-tracking branch 'upstream/develop' into feature/AddStyleCopAnalyzers ...

# Conflicts:
#	test/Ocelot.AcceptanceTests/Ocelot.AcceptanceTests.csproj
#	test/Ocelot.Benchmarks/Ocelot.Benchmarks.csproj

2018-03-03 12:33:04 +00:00

..

Properties

hacked together load balancing reroutes in fileconfig (#211)

2018-01-31 20:34:55 +00:00

appsettings.json

hacked together load balancing reroutes in fileconfig (#211)

2018-01-31 20:34:55 +00:00

configuration.json

Feature/#246 (#252)

2018-03-01 12:58:36 +00:00

idsrv3test.pfx

added cert to manual project for admin area testing

2017-10-29 19:22:25 +00:00

Ocelot.ManualTest.csproj

Add stylecop analyzers with default ruleset

2018-02-25 14:36:33 +00:00

Ocelot.postman_collection.json

hacked together load balancing reroutes in fileconfig (#211)

2018-01-31 20:34:55 +00:00

Program.cs

Feature/#246 (#252)

2018-03-01 12:58:36 +00:00

tempkey.rsa

miles away

2017-09-26 09:57:51 +01:00

web.config

hacked together load balancing reroutes in fileconfig (#211)

2018-01-31 20:34:55 +00:00