Oleg Pudeyev 95ac995be8 Merge remote-tracking branch 'bantu/ticket/10636' into develop ...

* bantu/ticket/10636:
  [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().

2012-02-10 13:25:46 -05:00

..

acp

Merge branch 'develop-olympus' into develop

2012-02-07 16:57:09 +01:00

auth

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

cache

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

captcha

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

config

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

cron

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

db

Merge branch 'develop-olympus' into develop

2012-01-12 22:30:23 -05:00

diff

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

extension

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

hooks

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

lock

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

mcp

[ticket/10637] Leftovers from implementation of extensions in mcp_post

2012-02-09 22:17:33 +02:00

questionnaire

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

request

[ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop

2012-02-04 00:57:39 +01:00

search

[ticket/10579] Delete extra v2 from license block.

2012-01-12 22:25:14 -05:00

template

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

ucp

Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop

2012-02-03 16:21:51 -05:00

utf

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

.htaccess

[ticket/9698] Add .htaccess to the includes subdirectory.

2010-10-15 16:47:21 +02:00

auth.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

bbcode.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

class_loader.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

constants.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

error_collector.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_acp.php

Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop

2012-01-02 17:54:54 +01:00

functions_admin.php

Merge remote-tracking branch 'bantu/ticket/10636' into develop

2012-02-10 13:25:46 -05:00

functions_compress.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_content.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_convert.php

Merge branch 'develop-olympus' into develop

2012-01-02 19:54:46 +01:00

functions_display.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_download.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_install.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_jabber.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_messenger.php

Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop

2012-01-02 17:54:54 +01:00

functions_module.php

[ticket/10634] Changing p_master::is_full_class

2012-02-09 01:34:37 +02:00

functions_posting.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_privmsgs.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_profile_fields.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_transfer.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_upload.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions_user.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

functions.php

Merge branch 'develop-olympus' into develop

2012-02-07 16:57:09 +01:00

group_positions.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

index.htm

…

message_parser.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00

session.php

Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop

2012-01-02 17:54:54 +01:00

startup.php

[ticket/9916] Updating header license and removing Version $Id$

2011-12-31 13:32:52 +00:00