phpbb/phpBB/phpbb/db
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
..
driver [ticket/12282] Add new line at EOF of the interface 2014-04-01 19:17:41 +02:00
migration Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into develop-ascraeus 2014-05-02 12:49:07 +02:00
migrator.php [ticket/12432] Migrator should not revert custom functions 2014-04-26 12:15:19 +02:00
sql_insert_buffer.php [ticket/12282] Use interface for type hinting 2014-04-01 19:17:41 +02:00
tools.php [ticket/12012] Move property to the top 2014-04-24 22:57:35 +02:00