Joseph Warner 3a6b3d7c2b [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth ...

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock
	phpBB/develop/create_schema_files.php
	phpBB/includes/ucp/ucp_register.php

PHPBB3-11673

2013-09-06 20:35:54 -04:00

..

convertors

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

2013-07-12 21:10:05 +02:00

data

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

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

schemas

[feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth

2013-09-06 20:35:54 -04:00

database_update.php

[ticket/11574] Remove install/udpate/new/ fallback from database_update.php

2013-07-30 01:38:06 +02:00

index.php

[ticket/11791] Load adm/ events from styles/adm/event/

2013-09-02 15:51:20 -05:00

install_convert.php

Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission

2013-07-11 11:41:48 +02:00

install_install.php

[ticket/11698] Moving all autoloadable files to phpbb/

2013-07-14 01:32:34 -04: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/11791] Load adm/ events from styles/adm/event/

2013-09-02 15:51:20 -05:00

phpinfo.php

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

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