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

Conflicts:
	phpBB/includes/mcp/mcp_main.php

2016-01-06 13:31:15 +01:00

..

acp

Merge branch '3.1.x'

2016-01-06 13:26:23 +01:00

diff

[ticket/12557] Fix pass by reference doc blocks

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

hooks

…

mcp

Merge branch '3.1.x'

2016-01-06 13:31:15 +01:00

questionnaire

[ticket/13494] Update calls to set_config()

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

ucp

Merge branch '3.1.x'

2015-10-17 12:02:14 +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 pull request #3618 from marc1706/ticket/13832

2015-06-24 16:36:15 +02:00

compatibility_globals.php

[ticket/13740] Fix CS in compatibilty_globals.php

2015-07-24 17:36:04 +02:00

constants.php

[release-3.2.0-a2] Update version to 3.2.0-a3

2015-12-19 17:34:46 +01:00

functions_acp.php

Merge branch '3.1.x'

2015-12-07 21:52:38 +01:00

functions_admin.php

Merge branch '3.1.x'

2015-10-15 11:02:02 +02:00

functions_compatibility.php

Merge branch '3.1.x'

2015-06-16 12:35:51 +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/14325] Preserve event variable BC

2015-11-30 18:05:46 +01:00

functions_convert.php

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

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

functions_database_helper.php

…

functions_display.php

[ticket/14325] Preserve event variable BC

2015-11-30 18:05:46 +01:00

functions_download.php

[ticket/13455] Update calls to request_var()

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

functions_jabber.php

[ticket/12487] Update PHP code

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

functions_mcp.php

[ticket/14325] Preserve event variable BC

2015-11-30 18:05:46 +01:00

functions_messenger.php

Merge branch '3.1.x'

2015-09-07 12:16:12 +02:00

functions_module.php

Merge branch '3.1.x'

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

functions_posting.php

[ticket/14325] Fix variable names in docblocks

2015-11-30 18:27:06 +01:00

functions_privmsgs.php

[ticket/14325] Fix variable names in docblocks

2015-11-30 18:27:06 +01:00

functions_transfer.php

[ticket/12999] Remove @author tags

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

functions_user.php

[ticket/14350] Remove duplicate semi-colon in functions_user

2015-12-08 23:20:25 +01:00

functions.php

Merge branch '3.1.x'

2015-12-07 21:52:38 +01:00

index.htm

…

message_parser.php

[ticket/14168] Use attachment manager instead of separate classes

2015-10-12 11:34:11 +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