Skip to content

S
StackExchange.Redis
Commit 9f0442b6 authored by Marc Gravell's avatar Marc Gravell
Browse files
Options

Merge branch 'patch-1' of https://github.com/stas-sultanov/StackExchange.Redis... 

Merge branch 'patch-1' of https://github.com/stas-sultanov/StackExchange.Redis into stas-sultanov-patch-1

Conflicts:
	StackExchange.Redis/StackExchange/Redis/ConfigurationOptions.cs

Note: tweaked a bit
parent 01b1ba66
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 93 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment