Oleg Pudeyev 48463cba2e Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10507] DBAL unit test
  [ticket/10507] Sort styles in acp

Conflicts:
	phpBB/includes/acp/acp_styles.php

2011-12-24 00:57:36 -05:00

..

acp

Merge branch 'develop-olympus' into develop

2011-12-24 00:57:36 -05:00

auth

…

cache

…

captcha

…

config

…

cron

…

db

…

diff

…

extension

…

hooks

…

lock

…

mcp

[ticket/10345] Make use of the plural function in some basic places

2011-11-25 15:10:44 -05:00

questionnaire

…

request

…

search

…

template

…

ucp

[ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions

2011-11-30 21:03:29 +01:00

utf

…

.htaccess

…

auth.php

…

bbcode.php

…

class_loader.php

…

constants.php

[prep-release-3.0.10] Bumping version number for 3.0.10-RC3.

2011-12-04 00:22:10 +01:00

error_collector.php

…

functions_acp.php

…

functions_admin.php

Merge branch 'develop-olympus' into develop

2011-12-03 22:25:32 -05:00

functions_compress.php

…

functions_content.php

[ticket/10345] Make use of the plural function in some basic places

2011-11-25 15:10:44 -05:00

functions_convert.php

…

functions_display.php

[ticket/10345] Make use of the plural function in some basic places

2011-11-25 15:10:44 -05:00

functions_download.php

…

functions_install.php

Merge branch 'develop-olympus' into develop

2011-12-03 22:25:32 -05:00

functions_jabber.php

…

functions_messenger.php

Merge branch 'develop-olympus' into develop

2011-11-20 18:45:56 +01:00

functions_module.php

…

functions_posting.php

Merge remote-tracking branch 'nickvergessen/ticket/10484' into develop

2011-11-24 21:51:10 -05:00

functions_privmsgs.php

[ticket/10345] Make use of the plural function in some basic places

2011-11-25 15:10:44 -05:00

functions_profile_fields.php

[ticket/10345] Use the plural function in some more places.

2011-11-25 15:10:49 -05:00

functions_transfer.php

…

functions_upload.php

[ticket/10345] Use the plural function in some more places.

2011-11-25 15:10:49 -05:00

functions_user.php

[ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions

2011-11-30 21:03:29 +01:00

functions.php

Merge remote-tracking branch 'cyberalien/ticket/develop/10399' into develop

2011-12-22 15:46:17 -05:00

group_positions.php

…

index.htm

…

message_parser.php

[ticket/10345] Use the plural function in some more places.

2011-11-25 15:10:49 -05:00

session.php

[ticket/10345] Check directly whether the key to use exists

2011-11-30 21:36:56 +01:00

startup.php

…