Joas Schilling a3883a6f23 Merge branch '3.1.x' ...

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg

2015-06-11 21:00:04 +02:00

..

acp

Merge branch '3.1.x'

2015-06-11 21:00:04 +02:00

diff

[ticket/12557] Fix pass by reference doc blocks

2014-08-07 11:39:04 +03:00

hooks

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

mcp

Merge branch '3.1.x'

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

questionnaire

[ticket/13494] Update calls to set_config()

2015-02-02 19:28:23 +01:00

ucp

Merge pull request #3696 from marc1706/ticket/13930-master

2015-06-09 21:27:23 +02:00

utf

[feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback

2014-11-08 11:41:58 +01:00

.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.1.x] Increase dev version to 3.1.6-dev

2015-06-11 20:57:26 +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

Merge branch 'ticket/13930' into ticket/13930-master

2015-06-08 15:39:47 +02:00

functions_database_helper.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

functions_display.php

Merge branch '3.1.x'

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

functions_download.php

[ticket/13455] Update calls to request_var()

2015-02-03 20:50:40 +01:00

functions_install.php

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

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

functions_jabber.php

[ticket/12487] Update PHP code

2015-01-11 13:22:59 +01:00

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

[ticket/12999] Remove @author tags

2014-08-19 22:54:45 +02:00

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

[ticket/12721] Update rules descriptions

2014-06-16 23:07:28 +02:00

startup.php

Merge branch '3.1.x'

2015-06-09 21:27:56 +02:00