Skip to content
Commit 742005d1 authored by J-M's avatar J-M
Browse files

Merge remote-tracking branch 'StatTag/develop' into merge/StatTag 

# Conflicts:
#	R.NET/Properties/VersionInfo.cs
#	RDotNet.Tests.sln
#	RDotNet.Tests/RDotNet.Tests.csproj
#	RDotNet.Tests/packages.config
parent efdb29eb
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment