Andreas Fischer db7b879b82 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer

Conflicts:
	.travis.yml
	composer.phar
	phpBB/composer.json
	phpBB/composer.lock
	tests/bootstrap.php

2012-07-19 16:59:45 +02:00

..

phpbb_database_connection_odbc_pdo_wrapper.php

Merge remote-tracking branch 'github-noxwizard/ticket/10678' into develop-olympus

2012-07-17 21:12:47 +02:00

phpbb_database_test_case.php

[ticket/10678] Typo and formatting

2012-05-13 16:56:07 -05:00

phpbb_database_test_connection_manager.php

Merge remote-tracking branch 'github-noxwizard/ticket/10678' into develop-olympus

2012-07-17 21:12:47 +02:00

phpbb_functional_test_case.php

Merge branch 'develop-olympus' into develop

2012-07-19 16:59:45 +02:00

phpbb_test_case_helpers.php

Merge branch 'develop-olympus' into develop

2012-07-17 21:13:05 +02:00

phpbb_test_case.php

[ticket/9916] Updating License in the header

2012-01-02 16:18:32 +00:00