Joas Schilling b566686b51 Merge branch 'develop-ascraeus' into develop ... Conflicts: phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php phpBB/phpbb/db/migration/profilefield_base_migration.php phpBB/phpbb/db/migrator.php		2015-01-20 23:32:36 +01:00
..
default	Merge branch 'develop-ascraeus' into develop	2015-01-20 23:32:36 +01:00
development	[ticket/13266] Enable the debug extension in the development environment	2014-11-22 12:33:45 +01:00
production	[ticket/12620] Fix tests	2014-11-20 21:13:26 +01:00
test	[ticket/12620] Fix tests	2014-11-20 21:13:26 +01:00
.htaccess	[feature/dic] Add trailing newline to htaccess	2012-07-26 15:58:26 +02:00