Marc Alexander 780e472458 Merge branch '3.1.x' ...

Conflicts:
	phpBB/styles/prosilver/template/viewtopic_body.html
	phpBB/styles/subsilver2/template/viewtopic_body.html

2015-11-15 19:56:30 +01:00

..

adm

Merge branch '3.1.x'

2015-11-10 17:40:41 +01:00

assets

Merge branch '3.1.x'

2015-11-12 17:57:02 +01:00

bin

Merge pull request #3857 from Nicofuma/ticket/14124

2015-10-07 14:47:23 +02:00

cache

…

config

[ticket/14273] Remove unused core.root_path dependency in files.upload service

2015-11-05 13:52:04 -08:00

develop

…

docs

Merge branch '3.1.x'

2015-11-15 19:56:30 +01:00

download

Merge branch '3.1.x'

2015-10-11 20:27:47 +02:00

ext

…

files

…

images

…

includes

Merge branch '3.1.x'

2015-11-12 08:50:22 +01:00

install

[ticket/14044] Deduplicate the installers

2015-10-22 21:29:52 +02:00

language

[ticket/14280] Add missing language strings for version check

2015-11-10 12:00:30 +01:00

phpbb

[ticket/14278] Check if user_id is set and fall back to ANONYMOUS

2015-11-09 18:23:38 +01:00

store

…

styles

Merge branch '3.1.x'

2015-11-15 19:56:30 +01:00

.htaccess

…

app.php

…

common.php

[ticket/14044] Deduplicate the installers

2015-10-22 21:29:52 +02:00

composer.json

[ticket/13789] Upgrade reCaptcha plugin to 2.0 API.

2015-10-14 19:05:27 -07:00

composer.lock

[ticket/13789] Update composer.lock.

2015-10-14 19:05:27 -07:00

cron.php

…

faq.php

…

feed.php

…

index.php

Merge branch '3.1.x'

2015-11-12 09:11:37 +01:00

mcp.php

…

memberlist.php

Merge branch '3.1.x'

2015-11-13 09:23:38 +01:00

posting.php

Merge branch '3.1.x'

2015-10-14 16:27:02 +02:00

report.php

…

search.php

[ticket/14234] Get rid of undefined variables

2015-10-12 21:56:09 +02:00

ucp.php

…

viewforum.php

…

viewonline.php

Merge branch '3.1.x'

2015-10-12 09:20:13 +02:00

viewtopic.php

Merge pull request #3896 from Zoddo/ticket/14157

2015-10-10 16:43:15 +02:00

web.config

…