Nathan Guse 3f27890a5e Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 ...

Conflicts:
	phpBB/includes/functions.php

2012-10-18 18:23:22 -05:00

..

acp

…

auth

…

cache

…

captcha

…

config

…

cron

…

db

…

di/processor

…

diff

…

event

…

extension

…

hooks

…

lock

…

mcp

…

notification

[ticket/11103] Add author name output to post/topic email templates

2012-10-16 23:27:49 -05:00

php

…

questionnaire

…

request

…

search

…

style

…

template

…

ucp

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

2012-10-18 18:23:22 -05:00

utf

…

.htaccess

…

bbcode.php

…

class_loader.php

…

constants.php

…

datetime.php

…

error_collector.php

…

functions_acp.php

…

functions_admin.php

…

functions_compress.php

…

functions_content.php

…

functions_convert.php

…

functions_display.php

Merge remote-tracking branch 'EXreaction/ticket/8796' into develop

2012-10-18 16:43:46 +02:00

functions_download.php

…

functions_install.php

…

functions_jabber.php

…

functions_messenger.php

…

functions_module.php

…

functions_posting.php

Merge PR #624 branch 'develop-olympus' into develop

2012-10-16 21:21:03 -04:00

functions_privmsgs.php

…

functions_profile_fields.php

…

functions_transfer.php

…

functions_upload.php

…

functions_user.php

…

functions.php

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

2012-10-18 18:23:22 -05:00

group_positions.php

…

index.htm

…

json_response.php

…

message_parser.php

…

session.php

…

sphinxapi.php

…

startup.php

…

update_helpers.php

…

user.php

…