Marc Alexander 382317b135 Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords ...

Conflicts:
	phpBB/config/services.yml

2013-12-29 13:46:42 +01:00

..

convertors

[prep-release-3.1.0-a2] Update version to 3.1.0-a2

2013-11-19 01:18:21 +01:00

data

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

schemas

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

2013-12-29 13:46:42 +01:00

database_update.php

[ticket/11883] Only output the migration time, not total

2013-10-04 09:23:54 -05:00

index.php

[task/code-sniffer] Fix argument list spacing.

2013-10-29 23:38:05 +01:00

install_convert.php

[ticket/11031] Fix container construction and missing objects

2013-10-23 21:13:25 +02:00

install_install.php

[feature/plupload/integration] Integration of Plupload

2013-10-11 17:40:16 +02:00

install_main.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

install_update.php

[ticket/11927] Prefix function with phpbb_

2013-11-07 13:49:55 +01:00

phpinfo.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00