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

..

firebird_schema.sql

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

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

index.htm

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

mssql_schema.sql

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

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

mysql_40_schema.sql

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

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

mysql_41_schema.sql

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

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

oracle_schema.sql

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

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

postgres_schema.sql

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

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

schema_data.sql

[prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constant

2013-11-19 01:37:31 +01:00

sqlite_schema.sql

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

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