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

@ -10,7 +10,6 @@
namespace PHPCI\Controller;
use b8;
use b8\Registry;
use PHPCI\Model\Build;
/**