Jass Bagga 88f29c76af Merge branch 'release/2.1' into jbagga/merge/release/2.1 ... # Conflicts: # build/dependencies.props		2018-03-19 16:31:39 -07:00
..
dependencies.props	Merge branch 'release/2.1' into jbagga/merge/release/2.1	2018-03-19 16:31:39 -07:00
repo.props	…
sources.props	…