diff options
author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-24 01:10:06 -0500 |
---|---|---|
committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-24 01:10:06 -0500 |
commit | 229d1092f8c18075ad03c6d67dd78707cbf1b421 (patch) | |
tree | 9d6c2636b3ba63b496fbfaa1b53c3dc9552fa02c /phpBB/includes/ucp/ucp_activate.php | |
parent | 9a0992f6a0618d8423d15db7fd7780fdfd4c1670 (diff) | |
parent | 4b9c163969cfffc302780d48015453a3ce472dca (diff) | |
download | forums-229d1092f8c18075ad03c6d67dd78707cbf1b421.tar forums-229d1092f8c18075ad03c6d67dd78707cbf1b421.tar.gz forums-229d1092f8c18075ad03c6d67dd78707cbf1b421.tar.bz2 forums-229d1092f8c18075ad03c6d67dd78707cbf1b421.tar.xz forums-229d1092f8c18075ad03c6d67dd78707cbf1b421.zip |
Merge PR #1201 branch 'bantu/ticket/11337' into develop-olympus
# By Andreas Fischer
# Via Andreas Fischer
* bantu/ticket/11337:
[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.
Diffstat (limited to 'phpBB/includes/ucp/ucp_activate.php')
0 files changed, 0 insertions, 0 deletions