Merge remote-tracking branch 'upstream/master'

Conflicts:
	composer.json
This commit is contained in:
a.cianfarani 2013-08-02 12:11:23 +02:00
commit 287a2b3632
49 changed files with 600 additions and 1032 deletions

View file

@ -67,7 +67,7 @@ class GithubBuild extends RemoteGitBuild
break;
}
$url = \b8\Registry::getInstance()->get('install_url');
$url = \b8\Config::getInstance()->get('phpci.url');
$params = array( 'state' => $status,
'target_url' => $url . '/build/view/' . $this->getId());
$headers = array(