Marc Alexander 33f4d267ef Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842 ...

Conflicts:
	phpBB/includes/acp/acp_groups.php

2013-11-27 14:55:24 +01:00

..

adm

Merge remote-tracking branch 'prototech/ticket/12036' into develop

2013-11-26 14:52:32 +01:00

assets

Merge pull request #1856 from prototech/ticket/12001

2013-11-21 13:56:03 -08:00

bin

[ticket/11998] Make phpbbcli executable and add shebang

2013-11-12 00:12:34 +01:00

cache

…

config

[ticket/12008] Update the run time value for the prune notifications cron task

2013-11-14 01:05:58 -08:00

develop

[ticket/11998] Turn develop/extensions.php into console commands.

2013-11-05 21:40:42 +01:00

docs

Merge pull request #1878 from blitze/ticket/12024

2013-11-21 13:26:24 -08:00

download

[ticket/11986] Fix undefined index: poster_id in file.php.

2013-10-29 06:02:04 -07:00

files

…

images

…

includes

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842

2013-11-27 14:55:24 +01:00

install

[prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constant

2013-11-19 01:37:31 +01:00

language

Merge branch 'develop-olympus' into develop

2013-11-26 11:33:17 +01:00

phpbb

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11842

2013-11-27 14:55:24 +01:00

store

…

styles

[ticket/12028] Replace L_COLON with literal colon

2013-11-21 23:20:16 +01:00

.htaccess

…

app.php

…

common.php

…

composer.json

[ticket/11998] Add symfony/console as dependency.

2013-11-03 01:52:40 +01:00

composer.lock

[ticket/11998] Add symfony/console as dependency.

2013-11-03 01:52:40 +01:00

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

[task/code-sniffer] Replace spaces with tabs.

2013-10-30 13:37:29 +01:00

report.php

…

search.php

…

ucp.php

…

viewforum.php

…

viewonline.php

[ticket/12015] Add some parameters to viewonline events

2013-11-13 23:44:57 +01:00

viewtopic.php

[ticket/12015] Fix variable name and event version

2013-11-21 23:42:40 +01:00

web.config

…