Joas Schilling 24058dfefc Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/includes/bbcode.php

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

..

acp

Merge branch 'develop-ascraeus' into develop

2015-01-09 17:41:47 +01:00

diff

…

hooks

…

mcp

…

questionnaire

…

ucp

…

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

…

constants.php

…

functions_acp.php

…

functions_admin.php

…

functions_compatibility.php

…

functions_compress.php

…

functions_content.php

…

functions_convert.php

[ticket/13441] Functions_convert fails to set global moderators default group

2015-01-03 13:45:52 +01:00

functions_database_helper.php

…

functions_display.php

[ticket/13300] Don't show jabber in profile if jabber is disabled

2014-11-09 02:22:39 +01:00

functions_download.php

…

functions_install.php

…

functions_jabber.php

…

functions_mcp.php

[ticket/12966] Sort by post_time and post_id where applicable

2014-08-23 16:36:39 +02:00

functions_messenger.php

…

functions_module.php

…

functions_posting.php

…

functions_privmsgs.php

…

functions_transfer.php

…

functions_upload.php

…

functions_user.php

[ticket/13207] Move default user notifications settings to user_add()

2014-10-25 14:57:01 -07:00

functions.php

[ticket/13440] Update event version to 3.1.3-RC1

2015-01-04 01:40:18 -08:00

index.htm

…

message_parser.php

[ticket/13466] Add bitfield and uid to event core.message_parser_check_message

2015-01-05 22:15:56 +01:00

sphinxapi.php

…

startup.php

…