1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-23 11:28:33 +01:00
Nils Adermann 854854b60f Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into develop-ascraeus
* github-elsensee/ticket/stenudd/8558-2:
  [ticket/8558] Fix operator
  [ticket/8558] Fix field length in ACP
  [ticket/8558] Use only one variable and improve explain string
  [ticket/8558] Add config in migrations and schema_data
  [ticket/8558] Add display name in emails from board

Conflicts:
	phpBB/includes/functions_messenger.php
2014-05-02 12:49:07 +02:00
..