Pranav K f166d0b8a8 Merge remote-tracking branch 'origin/release/2.1' into dev ... # Conflicts: # build/dependencies.props # korebuild-lock.txt		2018-03-29 12:23:18 -07:00
..
Templates.Test	Merge remote-tracking branch 'origin/release/2.1' into dev	2018-03-29 12:23:18 -07:00
Directory.Build.targets	…
GenerateTestProps.targets	…
TemplateTests.props.in	…