Joas Schilling 1104f788c3 Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/styles/subsilver2/template/confirm_delete_body.html		2014-11-21 21:00:00 +01: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	[ticket/13328] fix CS	2014-11-11 10:47:39 -06:00
mcp_front.php	[ticket/12966] Sort by post_time and post_id where applicable	2014-08-23 16:36:39 +02:00
mcp_logs.php	[ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs	2014-07-06 00:00:58 +02:00
mcp_main.php	[ticket/13100] Remove pointless variable	2014-11-04 00:46:06 +01:00
mcp_notes.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
mcp_pm_reports.php	[ticket/12990] Use the full services name for the notification's types	2014-08-16 21:46:03 +02:00
mcp_post.php	Merge branch 'develop-olympus' into develop-ascraeus	2014-07-10 15:26:27 +02:00
mcp_queue.php	[ticket/13116] Interchange post and topic approval notification	2014-09-29 21:13:53 +02:00
mcp_reports.php	[ticket/13057] Add $phpbb_dispatcher to the global in mcp/mcp_report.php	2014-09-11 22:01:09 +02:00
mcp_topic.php	[ticket/12612] Prefix check_ids() with phpbb_	2014-06-23 23:01:52 +02:00
mcp_warn.php	[ticket/13194] Use correct array to access bbcode_bitfield	2014-10-21 22:21:48 +02:00