• 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
Name
Last commit
Last update
..
README.Debian Loading commit data...
TODO Loading commit data...
aegir-cluster-slave.config Loading commit data...
aegir-cluster-slave.dirs Loading commit data...
aegir-cluster-slave.examples Loading commit data...
aegir-cluster-slave.postinst Loading commit data...
aegir-cluster-slave.postrm Loading commit data...
aegir-cluster-slave.prerm Loading commit data...
aegir-cluster-slave.templates Loading commit data...
aegir-hostmaster.config Loading commit data...
aegir-hostmaster.postinst Loading commit data...
aegir-hostmaster.templates Loading commit data...
aegir-provision.dirs Loading commit data...
aegir-provision.docs Loading commit data...
aegir-provision.examples Loading commit data...
aegir-provision.lintian Loading commit data...
aegir-provision.postinst Loading commit data...
aegir-provision.postrm Loading commit data...
aegir-provision.preinst Loading commit data...
changelog Loading commit data...
compat Loading commit data...
control Loading commit data...
copyright Loading commit data...
gbp.conf Loading commit data...
rules Loading commit data...