phpbb/phpBB/install
Joas Schilling b4db972840 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2
* 'develop' of https://github.com/phpbb/phpbb3: (204 commits)
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP
  [ticket/11247] Fix wrong property reference in flock class.
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.
  [ticket/10716] Collect standard error from executed php process.
  [ticket/10716] Skip test if php is not in PATH.
  [ticket/10716] Exclude our dependencies from linting.
  [ticket/10103] New and improved wording.
  [ticket/10716] Only lint on php 5.3+.
  [ticket/10103] Assert with messages.
  [ticket/10103] assertLessThan/assertGreaterThan.
  [ticket/10103] Inline assignment is bad?
  [ticket/10103] $rv had too few characters.
  [ticket/10103] Correct flock class documentation.
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/includes/groupposition/legend.php
2012-12-06 14:26:14 +01:00
..
convertors Merge branch 'develop-olympus' into develop 2012-10-06 06:15:01 +02:00
data [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
schemas [ticket/10411] Update schema and fix database update 2012-11-14 02:01:16 +01:00
database_update.php Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2 2012-12-06 14:26:14 +01:00
index.php Merge pull request #1056 from igorw/feature/compiled-dic 2012-11-11 09:05:15 -08:00
install_convert.php [ticket/11189] Replace DEBUG_EXTRA with DEBUG 2012-11-10 10:45:02 -06:00
install_install.php Merge PR #545 branch 'brunoais/ticket/10601' into develop 2012-12-01 15:09:38 -05: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/11213] Add missing global in install_update.php 2012-11-17 05:27:36 +01:00
phpinfo.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00