Marc Alexander 03c64d3384 Merge branch '3.1.x' ... Conflicts: phpBB/includes/mcp/mcp_forum.php		2015-08-09 10:15:02 +02:00
..
info	Merge branch 'develop-ascraeus' into develop	2014-05-28 18:19:20 +02:00
mcp_ban.php	[ticket/13119] Add another event which is triggered independent from actions	2014-10-01 14:54:26 +02:00
mcp_forum.php	Merge branch '3.1.x'	2015-08-09 10:15:02 +02:00
mcp_front.php	Merge branch '3.1.x'	2015-05-08 11:07:56 +02:00
mcp_logs.php	[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()	2015-02-03 20:50:40 +01:00
mcp_main.php	[ticket/8708] Apply permission 'f_announce_global'	2015-07-19 21:26:47 +02:00
mcp_notes.php	[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()	2015-02-03 20:50:40 +01:00
mcp_pm_reports.php	[ticket/11444] Moving the in-board notifications to a method class	2015-07-13 22:41:13 +02:00
mcp_post.php	Merge branch '3.1.x'	2015-07-17 16:15:25 +02:00
mcp_queue.php	[ticket/11444] Moving the in-board notifications to a method class	2015-07-13 22:41:13 +02:00
mcp_reports.php	[ticket/11444] Moving the in-board notifications to a method class	2015-07-13 22:41:13 +02:00
mcp_topic.php	Merge branch '3.1.x'	2015-03-05 15:47:04 +01:00
mcp_warn.php	[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()	2015-02-03 20:50:40 +01:00