Merge most recent changes from VVV main.

ericmann / vvv-apache

Apache-based fork of 10up's Varying Vagrant Vagrants configuration

56 stars 22 forks source link

Open montchr opened 10 years ago

ericmann commented 10 years ago

Can you update your PR to resolve merge conflicts? Then I'll merge it.