diff options
author | Nils Adermann <naderman@naderman.de> | 2011-06-11 03:03:18 +0200 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2011-06-11 03:03:18 +0200 |
commit | 9a44b5a26947ad03b4fd544687c23290a970379b (patch) | |
tree | 0532244dadc95fa2a0add85afa7cc5b420a0a612 /phpBB/docs/lighttpd.sample.conf | |
parent | 7f7a94e5dcddc6e3d3a75cf2cc27376e0a600fba (diff) | |
parent | a33b0f015a38cc2f54938fd60ff6a5691c2e9e28 (diff) | |
download | forums-9a44b5a26947ad03b4fd544687c23290a970379b.tar forums-9a44b5a26947ad03b4fd544687c23290a970379b.tar.gz forums-9a44b5a26947ad03b4fd544687c23290a970379b.tar.bz2 forums-9a44b5a26947ad03b4fd544687c23290a970379b.tar.xz forums-9a44b5a26947ad03b4fd544687c23290a970379b.zip |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10075] Rename nn- to Oleg in docs/AUTHORS.
[ticket/10075] Move APTX to Former Contributors in docs/AUTHORS.
Diffstat (limited to 'phpBB/docs/lighttpd.sample.conf')
0 files changed, 0 insertions, 0 deletions