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

Conflicts:
	phpBB/config/services.yml

2013-02-07 00:07:59 +01:00

..

template

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

2013-02-07 00:07:59 +01:00

theme

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

style.cfg

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

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