aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/controller/helper.php
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2013-01-24 01:16:56 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2013-01-24 01:16:56 -0500
commit01607be42a1c8fe2964c0c19a23473ccb5162801 (patch)
treecf85d449f5db9695a5bf57e30d9fa454ac767535 /phpBB/includes/controller/helper.php
parentec97e60e17ad18d96ed73fc563b766a365005e58 (diff)
parent229d1092f8c18075ad03c6d67dd78707cbf1b421 (diff)
downloadforums-01607be42a1c8fe2964c0c19a23473ccb5162801.tar
forums-01607be42a1c8fe2964c0c19a23473ccb5162801.tar.gz
forums-01607be42a1c8fe2964c0c19a23473ccb5162801.tar.bz2
forums-01607be42a1c8fe2964c0c19a23473ccb5162801.tar.xz
forums-01607be42a1c8fe2964c0c19a23473ccb5162801.zip
Merge PR #1201 branch 'develop-olympus' into develop
* develop-olympus: [ticket/11337] Abort setup-webserver.sh script when an error occurs. [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise. [ticket/11337] Silence nginx config file writing. [ticket/11337] php-fpm.conf is no longer owned by root. [ticket/11337] Run functional tests on travis using nginx and php-fpm. Conflicts: .travis.yml
Diffstat (limited to 'phpBB/includes/controller/helper.php')
0 files changed, 0 insertions, 0 deletions