Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
idk whats happening. updating php or something.
Merge branch 'feature/php' into develop
fixing that php.sh installs apache2.
nginx/apache needs to have some knowledge of PHP in them unfortunately
Merge branch 'feature/php' into develop
had to remove sendfile from vagrant config file, it ws breaking nginx
Merge branch 'feature/nginx' into develop
Merge branch 'develop'