Marc Alexander 1aae72961a Merge branch 'develop' into feature/avatars ...

Conflicts:
	phpBB/install/database_update.php

2012-12-09 21:02:31 +01:00

..

template

Merge branch 'develop' into feature/avatars

2012-12-09 21:02:31 +01:00

theme

Merge branch 'develop-olympus' into develop

2012-10-06 06:15:01 +02:00

style.cfg

[develop-olympus] Bumping version numbers to final for 3.0.11 releases.

2012-05-31 20:19:28 +02:00