diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 20:28:29 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-13 20:28:29 +0100 |
| commit | d3a1b670bd555c33ccbea4c7f58ac404e294381b (patch) | |
| tree | fa8ef932d1361530d7f0fe54ddad1615eb1d48bd /phpBB/docs/nginx.sample.conf | |
| parent | ac8db51c47eed82761699be9bd2a4394c39d6b6c (diff) | |
| parent | 0579795a173db538ce4aeb9b3ce09e55581e9f87 (diff) | |
| download | forums-d3a1b670bd555c33ccbea4c7f58ac404e294381b.tar forums-d3a1b670bd555c33ccbea4c7f58ac404e294381b.tar.gz forums-d3a1b670bd555c33ccbea4c7f58ac404e294381b.tar.bz2 forums-d3a1b670bd555c33ccbea4c7f58ac404e294381b.tar.xz forums-d3a1b670bd555c33ccbea4c7f58ac404e294381b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/7138] Allow simple header and footer for trigger_error() messages
Conflicts:
phpBB/styles/prosilver/template/message_body.html
Diffstat (limited to 'phpBB/docs/nginx.sample.conf')
0 files changed, 0 insertions, 0 deletions