diff options
author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 14:57:26 -0500 |
---|---|---|
committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-12 14:57:26 -0500 |
commit | 94b3d3839218135ddc6a24c432b4459943222bcb (patch) | |
tree | 41b863bec4528b2cc7796f1023e52f375a3234cc /phpBB/includes/mcp/mcp_forum.php | |
parent | e3dfe4f0465208fef525b20fcf1c630154514415 (diff) | |
parent | 4d14bdbf1307e020533dbe816a0754b049fe1657 (diff) | |
download | forums-94b3d3839218135ddc6a24c432b4459943222bcb.tar forums-94b3d3839218135ddc6a24c432b4459943222bcb.tar.gz forums-94b3d3839218135ddc6a24c432b4459943222bcb.tar.bz2 forums-94b3d3839218135ddc6a24c432b4459943222bcb.tar.xz forums-94b3d3839218135ddc6a24c432b4459943222bcb.zip |
Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
* remotes/upstream/develop-olympus:
[ticket/11829] Use report_closed to determine status in MCP report_details
Conflicts:
phpBB/styles/prosilver/template/mcp_post.html
Diffstat (limited to 'phpBB/includes/mcp/mcp_forum.php')
0 files changed, 0 insertions, 0 deletions