Joas Schilling 48d208a3a6 Merge branch '3.1.x' ...

Conflicts:
	phpBB/includes/functions_mcp.php

2015-02-26 22:48:52 +01:00

..

acp

Merge branch '3.1.x'

2015-02-24 20:44:37 +01:00

diff

[ticket/12557] Fix pass by reference doc blocks

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

hooks

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

mcp

Merge branch '3.1.x'

2015-02-18 18:04:46 +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-02-24 21:53:05 +01: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 branch 'develop-ascraeus' into develop

2015-01-09 17:49:30 +01:00

compatibility_globals.php

[ticket/13455] Update calls to request_var()

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

constants.php

Merge branch 'prep-release-3.1.3' into develop-ascraeus

2015-01-31 12:11:43 +01:00

functions_acp.php

[ticket/13045] Remove Pragma headers

2014-09-17 20:10:01 +02:00

functions_admin.php

[ticket/13496] Update calls to set_config_count()

2015-02-02 21:52:59 +01:00

functions_compatibility.php

[ticket/13497] Update calls to get_tables()

2015-02-11 21:28:11 +01:00

functions_compress.php

[ticket/13045] Remove Pragma headers

2014-09-17 20:10:01 +02:00

functions_content.php

Merge branch 'develop-ascraeus' into develop

2015-02-11 16:53:25 +01:00

functions_convert.php

[ticket/13494] Update calls to set_config()

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

functions_database_helper.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

functions_display.php

[ticket/13455] Update calls to request_var()

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

functions_download.php

[ticket/13455] Update calls to request_var()

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

functions_install.php

[ticket/13497] Update calls to get_tables()

2015-02-11 21:28:11 +01:00

functions_jabber.php

[ticket/12487] Update PHP code

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

functions_mcp.php

Merge branch '3.1.x'

2015-02-26 22:48:52 +01:00

functions_messenger.php

Merge branch 'develop-ascraeus' into develop

2015-02-11 16:53:25 +01:00

functions_module.php

[ticket/13455] Update calls to request_var()

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

functions_posting.php

Merge branch '3.1.x'

2015-02-18 18:04:46 +01:00

functions_privmsgs.php

Merge branch '3.1.x'

2015-02-18 18:04:46 +01:00

functions_transfer.php

[ticket/12999] Remove @author tags

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

functions_upload.php

[ticket/13031] Guess with all mimetype guessers and pick best guess

2014-09-05 10:56:06 +02:00

functions_user.php

Merge branch '3.1.x'

2015-02-20 20:29:45 +01:00

functions.php

Merge branch '3.1.x'

2015-02-24 21:57:14 +01:00

index.htm

…

message_parser.php

[ticket/13455] Remove unnecessary calls to utf8_normalize_nfc()

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

sphinxapi.php

[ticket/12721] Update rules descriptions

2014-06-16 23:07:28 +02:00

startup.php

[ticket/13531] Send 404 Not Found.

2015-01-21 01:02:16 +01:00