Marc Alexander f09db1a7b4 Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/config/services.yml

2014-08-11 12:23:21 +02:00

..

acp

Merge branch 'develop-ascraeus' into develop

2014-08-11 12:23:21 +02:00

diff

[ticket/12557] Fix pass by reference doc blocks

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

hooks

…

mcp

Merge branch 'develop-ascraeus' into develop

2014-08-11 07:32:27 +02:00

questionnaire

…

ucp

Merge branch 'develop-ascraeus' into develop

2014-08-11 12:23:21 +02:00

utf

…

.htaccess

…

bbcode.php

[ticket/12957] Update the constructions of the template engine

2014-08-10 03:32:27 +02:00

compatibility_globals.php

…

constants.php

…

functions_acp.php

Merge pull request #2730 from omniError/ticket/12831

2014-08-10 15:05:28 +02:00

functions_admin.php

…

functions_compatibility.php

…

functions_compress.php

…

functions_content.php

…

functions_convert.php

…

functions_database_helper.php

…

functions_display.php

[ticket/12938] Remove the 'Download all attachments' feature.

2014-08-09 16:33:59 +02:00

functions_download.php

[ticket/12938] Remove the 'Download all attachments' feature.

2014-08-09 16:33:59 +02:00

functions_install.php

Merge branch 'develop-olympus' into develop-ascraeus

2014-07-30 15:01:16 +02:00

functions_jabber.php

…

functions_mcp.php

…

functions_messenger.php

Merge branch 'develop-ascraeus' into develop

2014-08-10 18:07:11 +02:00

functions_module.php

[ticket/12919] Use the modules basename as identifier for extension modules

2014-08-07 14:06:45 +02:00

functions_posting.php

[ticket/12718] Use remove_topic_from_statistic() for delete_topic

2014-08-07 17:19:14 +02:00

functions_privmsgs.php

Merge branch 'ticket/11480' into ticket/11480-ascraeus

2014-07-30 21:01:05 +02:00

functions_transfer.php

…

functions_upload.php

[ticket/12941] Fix remaining Sami complaints.

2014-08-09 18:08:49 +02:00

functions_url_matcher.php

[ticket/12557] Fix php file description

2014-08-07 13:19:49 +03:00

functions_user.php

…

functions.php

Merge pull request #2842 from Nicofuma/ticket/11854

2014-08-11 12:20:35 +02:00

index.htm

…

message_parser.php

Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascraeus

2014-08-07 12:06:33 +02:00

sphinxapi.php

…

startup.php

…