Nathaniel Guse fd10d97cb1 Merge branch 'develop-olympus' into develop ...

# By Igor Wiedler (1) and others
* develop-olympus:
  [ticket/11671] Update composer.lock
  [ticket/11671] Add phing as a dependency and upgrade deps
  [ticket/11668] Move lint test to the end for travis

Conflicts:
	phpBB/composer.lock

2013-07-13 10:28:02 -05:00

..

install-php-extensions.sh

[ticket/11338] Travis CI: Install PHP extension for redis key-value store.

2013-01-23 01:39:39 +01:00

phpunit-mysql-travis.xml

Merge branch 'develop-olympus' into develop

2013-07-13 10:28:02 -05:00

phpunit-postgres-travis.xml

Merge branch 'develop-olympus' into develop

2013-07-13 10:28:02 -05:00

setup-webserver.sh

[ticket/11337] Abort setup-webserver.sh script when an error occurs.

2013-01-23 15:48:44 +01:00