• Steven Jones's avatar
    Merge branch '6.x-1.x' into 6.x-2.x · 2d414892
    Steven Jones authored
    Conflicts:
    	aegir.make
    	db/mysql/mysql_service.inc
    	debian/changelog
    	debian/gbp.conf
    	example/basic/basic_service.inc
    	http/Provision/Service/http/ssl.php
    	http/nginx/nginx.conf
    	http/nginx/nginx_advanced_include.conf
    	http/nginx/nginx_service.inc
    	http/nginx/nginx_simple_include.conf
    	http/nginx/vhost.tpl.php
    	http/nginx_ssl/nginx_ssl_service.inc
    	http/nginx_ssl/server_ssl.tpl.php
    	http/nginx_ssl/vhost_ssl.tpl.php
    	http/nginx_ssl/vhost_ssl_disabled.tpl.php
    	platform/provision_drupal.drush.inc
    	provision.config.inc
    	provision.context.inc
    	provision.file.inc
    	provision.info
    	release.sh
    	upgrade.sh.txt
    2d414892
To find the state of this project's repository at the time of any of these versions, check out the tags.
changelog 11.5 KB