Yuriy Rusko 1d61bcedfd Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594 ...

Conflicts:
	phpBB/docs/hook_system.html

2014-05-27 21:55:40 +02:00

..

phing-sniff.sh

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +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

[ticket/12592] Add PHP 5.4 environment using mysql driver.

2014-05-26 19:07:40 +02:00

phpunit-mysqli-travis.xml

[ticket/12592] Rename mysql environment to mysqli.

2014-05-26 18:49:29 +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-database.sh

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

setup-mariadb.sh

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

setup-php-extensions.sh

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

setup-phpbb.sh

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

setup-webserver.sh

Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594

2014-05-27 21:55:40 +02:00