aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-01-05 00:41:37 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-01-05 00:41:37 +0100
commitd968d35271229671d1285d6c53a1c6aa110307fb (patch)
tree2999e64d6f3554a75eff36321d55fa6e2281f2a4 /phpBB/docs
parentc54683be8c0493a51d9a1dbf4c605e95d17940b2 (diff)
parentcdeffdd59f79310e68d8931e54877359ba58c8e1 (diff)
downloadforums-d968d35271229671d1285d6c53a1c6aa110307fb.tar
forums-d968d35271229671d1285d6c53a1c6aa110307fb.tar.gz
forums-d968d35271229671d1285d6c53a1c6aa110307fb.tar.bz2
forums-d968d35271229671d1285d6c53a1c6aa110307fb.tar.xz
forums-d968d35271229671d1285d6c53a1c6aa110307fb.zip
Merge branch 'ticket/bantu/9589' into develop-olympus
* ticket/bantu/9589: [ticket/9589] nginx.conf.sample -> nginx.sample.conf
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/nginx.sample.conf (renamed from phpBB/docs/nginx.conf.sample)0
1 files changed, 0 insertions, 0 deletions
diff --git a/phpBB/docs/nginx.conf.sample b/phpBB/docs/nginx.sample.conf
index a22a126ff4..a22a126ff4 100644
--- a/phpBB/docs/nginx.conf.sample
+++ b/phpBB/docs/nginx.sample.conf