Nathaniel Guse a01da0c1ee Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 ...

Conflicts:
	phpBB/install/database_update.php

2013-02-26 15:32:27 -06:00

..

convertors

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

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

data

…

schemas

[feature/migrations] Revert unrelated change to schema_data.sql

2013-02-23 15:08:28 -06:00

database_update.php

[feature/migrations] Use the user class for language handling

2013-02-23 16:12:24 -06: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

Merge remote-tracking branch 'EXreaction/feature/migrations-data' into develop

2013-02-26 14:20:12 -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

…