Merge dev back into master#59

Merged

luispabon merged 10 commits intomasterfrom

Aug 15, 2016

Commits on Jul 26, 2016

Force SSL on site, add redundant www. host on prod apache conf to deal with letsencrypt not supporting wildcards yet
Luis Pabon
committed
Merge pull request #55 from phpdocker-io/ssl
luispabon
authored

Commits on Jul 29, 2016

Redirect all subdomains to main page
luispabon
committed

Commits on Aug 15, 2016