Marc Alexander b2ada8ba09 Merge branch '3.1.x' ...

Conflicts:
	phpBB/includes/mcp/mcp_main.php

2015-06-09 15:24:08 +02:00

..

acp

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

diff

…

hooks

…

mcp

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

questionnaire

…

ucp

Merge branch '3.1.x'

2015-06-08 17:59:49 +02:00

utf

…

.htaccess

…

bbcode.php

Merge branch '3.1.x'

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

compatibility_globals.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

constants.php

[3.0.x] Increment version number to 3.0.15-dev.

2015-04-28 20:40:20 +02:00

functions_acp.php

Merge branch '3.1.x'

2015-06-07 14:59:33 +02:00

functions_admin.php

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

functions_compatibility.php

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

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

functions_compress.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

functions_content.php

[ticket/13805] Updated generate_text_for_storage() to match message_parser

2015-05-02 01:53:11 +02:00

functions_convert.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

functions_database_helper.php

…

functions_display.php

Merge branch '3.1.x'

2015-06-06 18:12:54 +02:00

functions_download.php

…

functions_install.php

[ticket/13697] Moving filesystem related functions to filesystem service

2015-04-16 13:24:10 +02:00

functions_jabber.php

…

functions_mcp.php

Merge branch '3.1.x'

2015-03-06 14:30:14 +01:00

functions_messenger.php

[ticket/13804] Make template's user dependency optional

2015-05-05 19:16:49 +02:00

functions_module.php

Merge branch '3.1.x'

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

functions_posting.php

Merge branch '3.1.x'

2015-06-09 15:24:08 +02:00

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

Merge pull request #3524 from marc1706/ticket/8672

2015-04-27 16:26:40 +02:00

functions_user.php

Merge branch '3.1.x'

2015-06-04 17:30:16 +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

[ticket/13765] Verify SERVER_PROTOCOL has the expected format before using it.

2015-04-25 17:22:10 +02:00