diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-07-19 16:59:45 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-07-19 16:59:45 +0200 |
| commit | db7b879b8221fc1d1989e00645cb08f2866d9c10 (patch) | |
| tree | 01f09b1b7e37bd3bf79ce663a13d6c515c2ada3c /phpBB/includes/db/driver/postgres.php | |
| parent | 8b230f59db87190f9209ff965c01eb72466f45d2 (diff) | |
| parent | 3bbb882fe8b9c894e9ad6cf9b4c42b590b8b3fe2 (diff) | |
| download | forums-db7b879b8221fc1d1989e00645cb08f2866d9c10.tar forums-db7b879b8221fc1d1989e00645cb08f2866d9c10.tar.gz forums-db7b879b8221fc1d1989e00645cb08f2866d9c10.tar.bz2 forums-db7b879b8221fc1d1989e00645cb08f2866d9c10.tar.xz forums-db7b879b8221fc1d1989e00645cb08f2866d9c10.zip | |
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
Diffstat (limited to 'phpBB/includes/db/driver/postgres.php')
0 files changed, 0 insertions, 0 deletions