Joas Schilling 3b823465db Merge branch 'develop-olympus' into develop-ascraeus ... * develop-olympus: [ticket/12485] Broken tests due to absolute exclude Conflicts: .travis.yml phpunit.xml.all phpunit.xml.dist phpunit.xml.functional		2014-05-03 10:28:15 +02:00
..
phpunit-mariadb-travis.xml	[ticket/12485] Broken tests due to absolute exclude	2014-05-03 04:05:25 +02:00
phpunit-mysql-travis.xml	Merge branch 'develop-olympus' into develop-ascraeus	2014-05-03 10:28:15 +02:00
phpunit-postgres-travis.xml	Merge branch 'develop-olympus' into develop-ascraeus	2014-05-03 10:28:15 +02:00
phpunit-sqlite3-travis.xml	Merge branch 'develop-olympus' into develop-ascraeus	2014-05-03 10:28:15 +02:00
setup-mariadb.sh	[ticket/11970] Make apt-get less quiet.	2013-10-26 01:39:04 +02:00
setup-php-extensions.sh	[ticket/12281] Disable redis on travis until its fixed again	2014-03-16 16:36:58 +01:00
setup-webserver.sh	[ticket/12320] Install a nightly build of HHVM.	2014-04-10 11:37:25 +02:00