Bjorn Brala 0534ebf895 Merge remote-tracking branch 'mitchellh/master' into feature-hyperv-integration-services-fresh ...

# Conflicts:
#	plugins/providers/hyperv/action/import.rb
#	plugins/providers/hyperv/config.rb
#	website/source/docs/hyperv/configuration.html.md

2017-03-23 07:49:57 +01:00

..

assets

Fix heading text align scoping

2017-03-08 16:58:45 -08:00

docs

Merge remote-tracking branch 'mitchellh/master' into feature-hyperv-integration-services-fresh

2017-03-23 07:49:57 +01:00

layouts

Remove 'by hashicorp'

2017-03-08 16:58:00 -08:00

vmware

vmware/reseller: switch another email to sales at

2017-02-06 09:15:15 -08:00

404.html.md

Merge docs and www into a single static site

2016-01-19 14:35:05 -05:00

about.html.md

Merge docs and www into a single static site

2016-01-19 14:35:05 -05:00

community.html.erb

Update links to serf

2016-08-08 12:46:07 -04:00

downloads.html.erb

Use comma to set off nonrestrictive clause.

2016-08-03 15:46:42 -07:00

index.html.erb

Visual design changes to header

2017-02-23 15:43:03 -08:00

robots.txt

Merge docs and www into a single static site

2016-01-19 14:35:05 -05:00

security.html.erb

Update security.html.erb

2016-11-30 11:11:11 -08:00

sitemap.xml.builder

Merge docs and www into a single static site

2016-01-19 14:35:05 -05:00

sponsors.html.erb

Tabs to spaces

2016-01-19 14:54:13 -05:00

support.html.erb

Merge docs and www into a single static site

2016-01-19 14:35:05 -05:00