Marc Alexander d0adbe94d5 Merge branch '3.1.x' ...

Conflicts:
	phpBB/includes/mcp/mcp_main.php

2016-01-06 13:31:15 +01:00

..

info

Merge branch '3.1.x'

2015-10-11 10:48:53 +02:00

mcp_ban.php

…

mcp_forum.php

[ticket/14325] Preserve event variable BC

2015-11-30 18:05:46 +01:00

mcp_front.php

Merge branch '3.1.x'

2015-10-11 10:48:53 +02:00

mcp_logs.php

[ticket/9485] Add a "View post" link in the moderation logs

2015-08-30 19:52:00 +02:00

mcp_main.php

Merge branch '3.1.x'

2016-01-06 13:31:15 +01:00

mcp_notes.php

…

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-11-12 08:50:22 +01:00

mcp_queue.php

Merge branch '3.1.x'

2015-11-02 21:48:32 +01:00

mcp_reports.php

[ticket/9485] Add post_id to relevant $phpbb_log->add()

2015-08-30 22:43:07 +02:00

mcp_topic.php

Merge branch '3.1.x'

2015-09-16 22:48:10 +02:00

mcp_warn.php

[ticket/9485] Add post_id to relevant $phpbb_log->add()

2015-08-30 22:43:07 +02:00