Nils Adermann f958d05aed Merge branch '3.1.x' ...

* 3.1.x:
  [ticket/13790] Update phpcs

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock

2015-05-30 10:58:40 +02:00

..

acp

Merge pull request #3613 from nickvergessen/ticket/13844

2015-05-29 15:44:39 +02:00

diff

…

hooks

…

mcp

Merge branch '3.1.x'

2015-05-28 12:59:04 +02:00

questionnaire

…

ucp

Merge pull request #3383 from nickvergessen/ticket/9109

2015-05-29 16:04:56 +02:00

utf

…

.htaccess

…

bbcode.php

Merge branch '3.1.x'

2015-05-28 10:49:45 +02:00

compatibility_globals.php

…

constants.php

…

functions_acp.php

…

functions_admin.php

…

functions_compatibility.php

[ticket/13614] Added phpbb_pcre_utf8_support() dummy for BC

2015-05-11 20:48:05 +02:00

functions_compress.php

…

functions_content.php

…

functions_convert.php

…

functions_database_helper.php

…

functions_display.php

Merge branch '3.1.x'

2015-05-08 11:14:23 +02:00

functions_download.php

…

functions_install.php

…

functions_jabber.php

…

functions_mcp.php

…

functions_messenger.php

…

functions_module.php

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

functions_posting.php

…

functions_privmsgs.php

Merge pull request #3383 from nickvergessen/ticket/9109

2015-05-29 16:04:56 +02:00

functions_transfer.php

…

functions_upload.php

…

functions_user.php

[ticket/13614] Removed code that relies on phpbb_pcre_utf8_support()

2015-05-11 20:43:47 +02:00

functions.php

Merge pull request #3560 from Nicofuma/ticket/13790

2015-05-30 10:53:47 +02:00

index.htm

…

message_parser.php

Merge branch '3.1.x'

2015-05-28 10:49:45 +02:00

sphinxapi.php

…

startup.php

…