Merge remote-tracking branch 'origin/master'

# Conflicts: # source/RedisInside/Executables/redis-server.exe # source/RedisInside/Properties/AssemblyInfo.cs
poulfoged · Dec 1, 2016 · f09c79f · f09c79f
2 parents 2b01c21 + b200c71
commit f09c79f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/source/RedisInside/Properties/AssemblyInfo.cs b/source/RedisInside/Properties/AssemblyInfo.cs
@@ -11,4 +11,4 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("10e7016a-c115-4718-9250-8219b49374c4")]
-[assembly: AssemblyVersion("3.0.502")]
+[assembly: AssemblyVersion("3.0.502")]