Marc Alexander 70b04016eb Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	phpBB/includes/ucp/ucp_profile.php

2016-06-19 17:54:55 +02:00

..

acp

Merge branch 'ticket/14577' into ticket/14577-3.2.x

2016-04-02 09:51:37 +02:00

diff

…

hooks

…

mcp

Merge pull request #3874 from lavigor/ticket/14134

2016-03-26 18:59:31 +01:00

questionnaire

…

ucp

Merge branch '3.1.x' into 3.2.x

2016-06-19 17:54:55 +02:00

utf

…

.htaccess

…

bbcode.php

[ticket/13616] Updates direct call to twig environment constructor

2016-04-03 16:23:16 +02:00

compatibility_globals.php

[ticket/13616] Fix UI tests

2016-04-03 16:23:16 +02:00

constants.php

[3.1.x] Increase version for 3.1.10 development

2016-04-09 19:50:00 +02:00

functions_acp.php

Merge pull request #4021 from marc1706/ticket/14272

2016-03-27 13:34:17 +02:00

functions_admin.php

Revert "[ticket/14562] Language fallback for extension permissions"

2016-04-02 13:10:55 +02:00

functions_compatibility.php

…

functions_compress.php

…

functions_content.php

Merge branch '3.1.x' into 3.2.x

2016-06-13 22:08:17 +02:00

functions_convert.php

Merge branch 'ticket/14577' into ticket/14577-3.2.x

2016-04-02 09:51:37 +02:00

functions_database_helper.php

…

functions_display.php

[ticket/9435] Add NUM_PREDEFINED_BBCODES constant

2016-03-18 11:02:02 +01:00

functions_download.php

Merge branch '3.1.x' into 3.2.x

2016-06-11 13:45:48 +02:00

functions_jabber.php

…

functions_mcp.php

…

functions_messenger.php

[ticket/13616] Updates direct call to twig environment constructor

2016-04-03 16:23:16 +02:00

functions_module.php

…

functions_posting.php

[ticket/13264] Don't force approved state if post visibility is known (3.2)

2016-03-09 20:25:27 +01:00

functions_privmsgs.php

…

functions_transfer.php

…

functions_user.php

Merge branch '3.1.x' into 3.2.x

2016-02-13 18:08:01 +01:00

functions.php

Merge branch '3.1.x' into 3.2.x

2016-06-19 17:49:07 +02:00

index.htm

…

message_parser.php

[ticket/9435] Switch "ID" and BBcode name in constants keys

2016-03-19 17:17:03 +01:00

sphinxapi.php

…

startup.php

…