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

Conflicts:
	phpBB/includes/mcp/mcp_main.php

2015-06-09 15:24:08 +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

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01: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

Merge branch '3.1.x'

2015-06-09 15:24:08 +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/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

mcp_post.php

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

mcp_queue.php

[ticket/13654] Moving reporting into controller

2015-04-16 11:29:11 +02:00

mcp_reports.php

Merge branch '3.1.x'

2015-05-28 12:59:04 +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