Marc Alexander d26ad8ed26 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars ...

Conflicts:
	phpBB/install/database_update.php

2013-03-04 00:22:15 +01:00

..

info

…

mcp_ban.php

…

mcp_forum.php

Merge PR #1140 branch 'develop-olympus' into develop

2012-12-16 16:48:15 -05:00

mcp_front.php

…

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

Merge PR #1140 branch 'develop-olympus' into develop

2012-12-16 16:48:15 -05:00

mcp_notes.php

[feature/avatars] Add phpbb prefix to new functions

2013-01-04 15:10:43 +01:00

mcp_pm_reports.php

Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103

2013-01-15 11:31:39 -06:00

mcp_post.php

…

mcp_queue.php

[ticket/11103] Mark topic/post subscription notification read when approved

2012-12-15 10:33:03 -06:00

mcp_reports.php

Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103

2013-01-15 11:31:39 -06:00

mcp_topic.php

Merge PR #1140 branch 'develop-olympus' into develop

2012-12-16 16:48:15 -05:00

mcp_warn.php

[feature/avatars] Add phpbb prefix to new functions

2013-01-04 15:10:43 +01:00