5 commits

Author	SHA1	Message	Date
a.cianfarani	287a2b3632	Merge remote-tracking branch 'upstream/master' ... Conflicts: composer.json	2013-08-02 12:11:23 +02:00
Dan Cryer	eac86ff2bd	Finishing updates to make PHPCI use Bootstrap v3, as per issue #99	2013-07-31 21:04:34 +01:00
a.cianfarani	74f3b145f2	Merge upstream/master	2013-06-05 16:48:01 +02:00
Dan Cryer	fa7ad2f45d	Removing short open tags and replacing with print statements.	2013-05-14 18:28:03 +01:00
Dan Cryer	188162f0a2	Adding user accounts.	2013-05-10 16:25:51 +01:00