Oliver Schramm fbb9f8859a Merge branch '3.1.x' ...

Conflicts:
	phpBB/includes/acp/acp_captcha.php

2015-11-06 13:28:24 +01:00

..

acp

Merge branch '3.1.x'

2015-11-06 13:28:24 +01:00

diff

…

hooks

…

mcp

Merge pull request #3983 from prototech/ticket/13831

2015-11-02 21:48:32 +01:00

questionnaire

…

ucp

Merge branch '3.1.x'

2015-10-17 12:02:14 +02:00

utf

…

.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

[ticket/14044] global $table_prefix in constants.php

2015-10-28 01:12:52 +01:00

functions_acp.php

[ticket/14234] Fix event doc blocks

2015-10-12 22:20:52 +02: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

…

functions_content.php

[ticket/14234] Fix change version and remove more references

2015-10-12 19:41:17 +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

…

functions_display.php

[ticket/14234] Fix change version and remove more references

2015-10-12 19:41:17 +02:00

functions_download.php

…

functions_jabber.php

…

functions_mcp.php

[ticket/14234] Fix change version and remove more references

2015-10-12 19:41:17 +02: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

Merge pull request #3965 from marc1706/ticket/14234

2015-10-14 08:59:17 +02:00

functions_privmsgs.php

Merge pull request #3965 from marc1706/ticket/14234

2015-10-14 08:59:17 +02:00

functions_transfer.php

…

functions_user.php

Merge branch '3.1.x'

2015-10-12 10:27:13 +02:00

functions.php

Merge branch '3.1.x'

2015-10-22 10:05:25 -07: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

…

startup.php

Merge branch '3.1.x'

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