diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-03-12 16:28:47 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-03-12 16:28:47 +0100 |
| commit | b809bea3d4d56cd5cb2b9d3aa44f96c038ae807f (patch) | |
| tree | b3429111955ea81b159b47df0d4f8e5834b3d532 /phpBB/includes/startup.php | |
| parent | ad6fda57764d2635741fc07f3db32fbe42057b72 (diff) | |
| parent | d81a604ef853be782046d00a2f55160d8619b335 (diff) | |
| download | forums-b809bea3d4d56cd5cb2b9d3aa44f96c038ae807f.tar forums-b809bea3d4d56cd5cb2b9d3aa44f96c038ae807f.tar.gz forums-b809bea3d4d56cd5cb2b9d3aa44f96c038ae807f.tar.bz2 forums-b809bea3d4d56cd5cb2b9d3aa44f96c038ae807f.tar.xz forums-b809bea3d4d56cd5cb2b9d3aa44f96c038ae807f.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10549] using correct variable in includes/functions_module.php too
[ticket/10549] changed "right" to "incorrect"
Conflicts:
phpBB/includes/functions_module.php
Diffstat (limited to 'phpBB/includes/startup.php')
0 files changed, 0 insertions, 0 deletions