• 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
Provision Loading commit data...
Symfony/Component/ClassLoader Loading commit data...
db Loading commit data...
debian Loading commit data...
dns Loading commit data...
example Loading commit data...
http Loading commit data...
platform Loading commit data...
tests Loading commit data...
.gitignore Loading commit data...
LICENSE.txt Loading commit data...
README.txt Loading commit data...
aegir.make Loading commit data...
example.drushrc.php Loading commit data...
example.sudoers Loading commit data...
install.hostmaster.inc Loading commit data...
migrate.hostmaster.inc Loading commit data...
parse.backend.inc Loading commit data...
provision.api.php Loading commit data...
provision.context.inc Loading commit data...
provision.drush.inc Loading commit data...
provision.file.inc Loading commit data...
provision.inc Loading commit data...
provision.info Loading commit data...
provision.service.inc Loading commit data...
release.sh Loading commit data...
upgrade.sh.txt Loading commit data...