Commit b1fd15ee authored by Marc Gravell's avatar Marc Gravell

Merge branch 'wjdavis5-AddGeoAdd' of...

Merge branch 'wjdavis5-AddGeoAdd' of github.com:StackExchange/StackExchange.Redis into wjdavis5-AddGeoAdd

# Conflicts:
#	StackExchange.Redis.Tests/ConnectionFailedErrors.cs
#	StackExchange.Redis/StackExchange/Redis/GeoEntry.cs
#	StackExchange.Redis/StackExchange/Redis/IDatabase.cs
#	StackExchange.Redis/StackExchange/Redis/KeyspaceIsolation/DatabaseWrapper.cs
#	StackExchange.Redis/StackExchange/Redis/Message.cs
#	StackExchange.Redis/StackExchange/Redis/RedisDatabase.cs
parents 879cef27 c4e9fd05
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