Commit c07ae40f authored by anarcat's avatar anarcat Committed by anarcat

Merge branch 'master' of ssh://git.koumbit.net/provision

Conflicts:
	aegir.make
parents 12ae5e47 23b898e9
......@@ -4,4 +4,3 @@ projects[] = "drupal"
projects[hostmaster][type] = "profile"
projects[hostmaster][download][type] = "get"
projects[hostmaster][download][url] = "http://files.aegirproject.org/hostmaster-0.4-alpha5.tgz"
projects[hostmaster][directory_name] = "hostmaster"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment