phpbb/phpBB/config
Joas Schilling c2974187e5 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714
* 'develop' of https://github.com/phpbb/phpbb3: (119 commits)
  [ticket/10986] message.id fallback to SERVER_NAME or phpbb.generated
  [ticket/11358] Changed the name of post parameter.
  [ticket/11358] Changed the action parameter value to represent the link.
  [ticket/11358] Enabled link making all users default for a group.
  [ticket/11358] Removed redundant code and referred proper variable.
  [ticket/11358] Success message even without selecting a user.
  [ticket/11355] Referred proper variable when validating selection.
  [ticket/11355] Wrong error message when no user is selected.
  [ticket/10896] Add missing email validation lost in develop merge
  [ticket/7262] Add note about set_config() not updating is_dynamic.
  [ticket/7262] Add $is_dynamic example to set_config() and set_config_count().
  [ticket/7262] Backport set_config() and set_config_count() docs from develop.
  [ticket/11122] Move rxu to 'Former Contributors' section.
  [ticket/11122] Add EXreaction to docs/AUTHORS.
  [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION
  [ticket/11361] Make sure that array passed to strtr() has the proper format.
  [ticket/11179] remove extra & in function call
  [ticket/11179] correct start parameter in sphinx search
  [ticket/11179] correct start parameter in native author search
  [ticket/11179] correct start parameter in native keyword search
  ...

Conflicts:
	phpBB/config/tables.yml
2013-02-25 16:04:22 +01:00
..
.htaccess [feature/dic] Add trailing newline to htaccess 2012-07-26 15:58:26 +02:00
cron_tasks.yml [ticket/11257] Do not require set_name() method to exist 2012-12-07 21:25:42 -06:00
migrator.yml [feature/migrations] Migrations now somewhat works 2013-01-09 16:44:07 -06:00
routing.yml [feature/controller] Update routing documentation for using query string 2012-11-18 13:40:24 -05:00
services.yml Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714 2013-02-25 16:04:22 +01:00
tables.yml Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10714 2013-02-25 16:04:22 +01:00