Marc Alexander b17fc98043 Merge branch '3.1.x' ...

Conflicts:
	phpBB/styles/subsilver2/template/memberlist_body.html
	phpBB/styles/subsilver2/template/memberlist_team.html

2015-10-18 10:33:05 +02:00

..

adm

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

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

assets

[ticket/12769] Fix font permissions

2015-09-17 18:57:33 +02:00

bin

Merge pull request #3857 from Nicofuma/ticket/14124

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

cache

…

config

[ticket/14240] Fix packaging script for 3.2

2015-10-15 18:24:41 +02:00

develop

…

docs

Merge branch '3.1.x'

2015-10-14 08:33:36 +02: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-10-17 12:02:14 +02:00

install

[ticket/13371] Add language files to the service as well

2015-10-17 15:02:09 +02:00

install_new

…

language

Merge branch '3.1.x'

2015-10-18 10:33:05 +02:00

phpbb

Merge branch '3.1.x'

2015-10-17 12:13:32 +02:00

store

…

styles

Merge branch '3.1.x'

2015-10-18 10:33:05 +02:00

.htaccess

…

app.php

…

common.php

…

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

…

mcp.php

…

memberlist.php

Merge branch '3.1.x'

2015-10-14 16:36:52 +02: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

…