phpbb/phpBB/styles
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
..
prosilver Merge branch 'develop-olympus' into develop 2011-11-18 19:42:44 +01:00
subsilver2 Merge branch 'develop-olympus' into develop 2011-11-14 22:01:36 +01:00