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

..

template

Merge branch 'develop-olympus' into develop

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

theme

Merge branch 'develop-olympus' into develop

2011-11-14 13:45:01 +01:00

style.cfg

[develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases.

2011-06-12 19:45:01 +02:00