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

Conflicts:
	phpBB/includes/ucp/ucp_groups.php

2013-01-04 10:49:57 +01:00

..

convertors

[ticket/11015] Move db driver class name fixing to function

2012-11-17 00:24:32 +01:00

data

…

schemas

Merge branch 'develop' into feature/avatars

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

database_update.php

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

2013-01-04 10:49:57 +01:00

index.php

[ticket/11305] Define hook finder as a service on the container.

2013-01-02 01:36:50 -05:00

install_convert.php

[ticket/10758] Dependency inject parameters into cache_moderators.

2012-12-15 16:50:28 -05:00

install_install.php

[ticket/11305] Adjust comment.

2013-01-02 01:32:22 -05:00

install_main.php

…

install_update.php

Merge PR #1130 branch 'EXreaction/ticket/11259' into develop

2012-12-29 13:45:40 -05:00

phpinfo.php

…