Marc Alexander 2e3f89444a Merge branch 'ticket/14136' into ticket/14136-3.2.x ...

Conflicts:
	phpBB/adm/style/install_update_diff.html
	phpBB/adm/style/installer_header.html
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html

2016-03-24 16:12:56 +01:00

..

acp

[ticket/14315] Add back roles select for disable javascript

2016-02-16 18:21:04 +01:00

diff

[ticket/13454] Add excessively removed code back

2016-01-06 13:52:11 +01:00

hooks

…

mcp

Merge branch '3.1.x'

2016-01-16 23:10:37 +01:00

questionnaire

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

ucp

Merge pull request #4058 from marc1706/ticket/13454

2016-01-09 17:53:04 +01:00

utf

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

.htaccess

…

bbcode.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01: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-b2] Update versions to 3.2.0-3-dev

2016-03-07 17:36:16 +01:00

functions_acp.php

Merge branch '3.1.x' into 3.2.x

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

functions_admin.php

Merge branch '3.1.x'

2016-01-21 17:37:15 +01:00

functions_compatibility.php

Merge branch '3.1.x'

2015-06-16 12:35:51 +02:00

functions_compress.php

[ticket/13454] Remove unused variables

2016-01-06 13:51:19 +01:00

functions_content.php

Merge branch '3.1.x' into 3.2.x

2016-02-27 12:44:28 +01:00

functions_convert.php

[ticket/13454] Add excessively removed code back

2016-01-06 13:52:11 +01:00

functions_database_helper.php

…

functions_display.php

[ticket/13454] Remove more unused variables

2016-01-06 13:52:11 +01:00

functions_download.php

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

2016-03-24 16:12:56 +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' into 3.2.x

2016-02-28 10:15:47 +01:00

functions_module.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

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

[ticket/13454] Remove more unused variables

2016-01-06 13:52:11 +01:00

functions_transfer.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

functions_user.php

Merge branch '3.1.x' into 3.2.x

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

functions.php

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

2016-03-24 16:12:56 +01:00

index.htm

…

message_parser.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

sphinxapi.php

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

startup.php

Merge branch '3.1.x'

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