diff options
author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-06 11:11:27 -0500 |
---|---|---|
committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-06 11:11:27 -0500 |
commit | 87ea50948ea53c0d1beab5b44badebeae4292d1a (patch) | |
tree | dbc99fde4dfc62b84bae60c7e4ab5c02ddbe8a3c /phpBB/language/en/acp/prune.php | |
parent | [feature/prune-users] Move quote to the correct line. (diff) | |
parent | Merge branch 'develop-olympus' into develop (diff) | |
download | phpbb-87ea50948ea53c0d1beab5b44badebeae4292d1a.tar.gz phpbb-87ea50948ea53c0d1beab5b44badebeae4292d1a.tar.bz2 phpbb-87ea50948ea53c0d1beab5b44badebeae4292d1a.zip |
Merge remote-tracking branch 'upstream/develop' into feature/prune-users
* upstream/develop: (2171 commits)
[ticket/11164] Update composer.phar
[ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.
[ticket/10933] Dependency inject template context.
[ticket/10933] Expanded prose documentation for phpbb_extension_provider.
[ticket/10933] Specify empty template path for absolute includephp test.
[ticket/10933] Useful documentation for template locate function
[ticket/10933] Typo fixes
[ticket/10933] Initialize template context when template is constructed.
[ticket/11099] Mark acp_ban::display_ban_options() as static.
[ticket/11158] Require acl_u_sig for ucp signature module.
[ticket/11158] Revert old fix in PHPBB3-10186.
[ticket/11159] static public is the currently approved order.
[ticket/11157] static public is the currently approved order.
[ticket/11157] Fix remaining captcha spam.
[ticket/11157] get_captcha_types is an instance method.
[ticket/11156] Delete "Misc" tab of forum based permissions + move items
[ticket/10848] Move include up.
[ticket/11014] Fix old pagination assignment
[ticket/11018] Fix several paginations in ACP
[ticket/11014] Fix IF statements for new template pagination
...
Conflicts:
phpBB/includes/functions_user.php
Diffstat (limited to 'phpBB/language/en/acp/prune.php')
-rw-r--r-- | phpBB/language/en/acp/prune.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php index 9bd8adc00f..fcc085205b 100644 --- a/phpBB/language/en/acp/prune.php +++ b/phpBB/language/en/acp/prune.php @@ -4,9 +4,8 @@ * acp_prune [English] * * @package language -* @version $Id$ * @copyright (c) 2005 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ |