Joas Schilling 8663edce76 Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/constants.php
	phpBB/includes/functions_user.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg

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

..

acp

[ticket/14448] Let user decide if remote upload certs should be checked

2016-02-04 17:14:48 +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

…

constants.php

[3.1.x] Increase dev version for 3.1.9

2016-02-13 18:01:32 +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

…

functions_compress.php

[ticket/13454] Remove unused variables

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

functions_content.php

[ticket/13454] Add excessively removed code back

2016-01-06 13:52:11 +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

[ticket/13454] Remove unused variables

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

functions_jabber.php

…

functions_mcp.php

[ticket/14325] Preserve event variable BC

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

functions_messenger.php

[ticket/14444] Fix fatal error in functions_messenger.php

2016-02-02 15:45:03 +01:00

functions_module.php

[ticket/13454] Remove unused variables

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

functions_posting.php

[ticket/13454] Remove more unused variables

2016-01-06 13:52:11 +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 '3.1.x' into 3.2.x

2016-02-13 18:08:01 +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

…