diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-13 20:30:16 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-13 20:32:43 -0600 |
| commit | 5c614ff6249c441637103ba0b78338f878057479 (patch) | |
| tree | 7fb26e68c76f837ded2fdc39f27b5f2572a586ee /phpBB/includes/mcp/mcp_main.php | |
| parent | 71bcc58feecd49fe05f6b7e0e2bca8a94424f240 (diff) | |
| download | forums-5c614ff6249c441637103ba0b78338f878057479.tar forums-5c614ff6249c441637103ba0b78338f878057479.tar.gz forums-5c614ff6249c441637103ba0b78338f878057479.tar.bz2 forums-5c614ff6249c441637103ba0b78338f878057479.tar.xz forums-5c614ff6249c441637103ba0b78338f878057479.zip | |
[ticket/8610] Revert some funky merging I did from rebase
PHPBB3-8610
Diffstat (limited to 'phpBB/includes/mcp/mcp_main.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_main.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index cce4db8b4d..0cef8933fc 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -1336,4 +1336,4 @@ function mcp_fork_topic($topic_ids) } } -?> +?>
\ No newline at end of file |