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
..
data	Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into develop-ascraeus	2014-05-02 12:49:07 +02:00
tool	Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into develop-ascraeus	2014-04-10 14:04:43 -07:00
exception.php	[ticket/12349] Update license header in several new files	2014-04-03 15:42:36 +02:00
helper.php	[ticket/12349] Update license header in several new files	2014-04-03 15:42:36 +02:00
migration.php	Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into develop-ascraeus	2014-04-10 14:04:43 -07:00
profilefield_base_migration.php	[ticket/12349] Update license header in several new files	2014-04-03 15:42:36 +02:00
schema_generator.php	Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into develop-ascraeus	2014-04-10 14:04:43 -07:00