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

Conflicts:
	phpBB/install/database_update.php

2013-03-04 00:22:15 +01:00

..

template

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

2013-03-04 00:22:15 +01:00

theme

Merge remote-tracking branch 'remotes/VSE/ticket/11103-VSEphpbb' into ticket/11103

2013-02-28 09:56:37 -06:00

style.cfg

…