Nate McMaster 6586c921f0 Fix compiler error introduced by merge conflict		2018-06-04 10:39:30 -07:00
..
docker	…
lineups	Merge branch 'release/2.0' into release/2.1	2018-06-01 17:08:08 -07:00
tasks	Fix compiler error introduced by merge conflict	2018-06-04 10:39:30 -07:00
tools	Fixup bad changes from merge	2018-06-01 17:16:43 -07:00
AzureIntegration.targets	…
GenerateCode.targets	…
Key.snk	…
PackageArchive.targets	…
Publish.targets	Don't expect the site extension zip to exist in build output if AzureIntegration is not patching	2018-05-31 22:52:09 -07:00
RepositoryBuild.targets	Merge branch 'release/2.0' into release/2.1	2018-06-01 17:08:08 -07:00
SharedFx.props	…
SharedFx.targets	…
SharedFxInstaller.targets	…
Templating.targets	…
artifacts.props	…
buildorder.props	…
common.props	…
dependencies.props	…
external-dependencies.props	…
repo.beforecommon.props	…
repo.props	…
repo.targets	Merge branch 'release/2.0' into release/2.1	2018-06-01 17:08:08 -07:00
sources.props	…
submodules.props	…