Nils Adermann 0a4efcbe8c Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/9956] Display error message if no disapprove reason given

Conflicts:
	phpBB/includes/mcp/mcp_queue.php

2011-11-18 19:42:44 +01:00

..

info

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

mcp_ban.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

mcp_forum.php

[feature/remove-imagesets] Adjustments to php files

2011-09-04 01:08:00 +03:00

mcp_front.php

[ticket/9684] Remove code in some more files especially includes/

2011-04-07 13:47:06 +02:00

mcp_logs.php

Merge branch 'develop-olympus' into develop

2011-07-16 21:00:14 -04:00

mcp_main.php

Merge branch 'develop-olympus' into develop

2011-10-14 17:56:46 +02:00

mcp_notes.php

Merge branch 'develop-olympus' into develop

2011-07-16 21:00:14 -04:00

mcp_pm_reports.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

mcp_post.php

Merge branch 'develop-olympus' into develop

2011-11-13 15:47:40 +01:00

mcp_queue.php

Merge branch 'develop-olympus' into develop

2011-11-18 19:42:44 +01:00

mcp_reports.php

[ticket/9684] Remove code in some more files especially includes/

2011-04-07 13:47:06 +02:00

mcp_topic.php

Merge branch 'develop-olympus' into develop

2011-11-13 15:47:40 +01:00

mcp_warn.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00