Marc Alexander 2265811cd1 Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars ... Conflicts: phpBB/adm/style/acp_groups.html phpBB/adm/style/acp_users_avatar.html phpBB/includes/acp/acp_groups.php phpBB/includes/acp/acp_users.php phpBB/includes/functions_display.php phpBB/install/database_update.php phpBB/install/schemas/mssql_schema.sql phpBB/styles/prosilver/template/ucp_avatar_options.html		2012-11-12 14:57:28 +01:00
..
info	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
mcp_ban.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
mcp_forum.php	Merge PR #722 branch 'Senky/ticket/9918' into develop	2012-11-06 21:10:20 -05:00
mcp_front.php	[ticket/11140] Fix an error from an incorrect variable name	2012-10-09 22:00:28 -05:00
mcp_logs.php	[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968	2012-10-17 23:34:37 +02:00
mcp_main.php	[ticket/11052] update search backend constructor everywhere	2012-08-15 22:05:26 +05:30
mcp_notes.php	Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars	2012-11-12 14:57:28 +01:00
mcp_pm_reports.php	[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968	2012-10-17 23:34:37 +02:00
mcp_post.php	[ticket/11052] update search backend constructor everywhere	2012-08-15 22:05:26 +05:30
mcp_queue.php	[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968	2012-10-17 23:34:37 +02:00
mcp_reports.php	Merge PR #786 branch 'brunoais/ticket/10845' into develop	2012-11-06 16:23:33 -05:00
mcp_topic.php	Merge PR #722 branch 'Senky/ticket/9918' into develop	2012-11-06 21:10:20 -05:00
mcp_warn.php	Merge branch 'feature/avatars' of https://github.com/igorw/phpbb3 into feature/avatars	2012-11-12 14:57:28 +01:00