Marc Alexander 087a42a887 Merge branch '3.1.x' ...

Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html

2015-09-12 13:24:29 +02:00

..

adm

Merge branch '3.1.x'

2015-08-17 09:39:16 +02:00

assets

Merge branch '3.1.x'

2015-08-05 13:41:59 +02:00

bin

[ticket/14125] Add --env option to all CLI commands

2015-08-24 18:07:37 +02:00

cache

…

config

[ticket/14150] Update fast-image-size to newest version

2015-09-08 12:59:55 +02:00

develop

[ticket/8708] Add f_announce_global permission

2015-07-19 21:26:47 +02:00

docs

Merge branch '3.1.x'

2015-09-12 13:24:29 +02:00

download

Merge branch '3.1.x'

2015-08-22 10:36:15 +02:00

ext

…

files

…

images

…

includes

Merge branch '3.1.x'

2015-09-09 11:06:58 +02:00

install

[prep-release-3.1.6] Update version for final 3.1.6 release

2015-09-05 12:45:00 +02:00

install_new

[ticket/14052] Translate installer commands

2015-07-27 11:40:12 +02:00

language

Merge pull request #3870 from Zoddo/ticket/9485

2015-09-09 11:04:13 +02:00

phpbb

Merge pull request #3870 from Zoddo/ticket/9485

2015-09-09 11:04:13 +02:00

store

…

styles

Merge branch '3.1.x'

2015-09-12 13:24:29 +02:00

.htaccess

…

app.php

…

common.php

[ticket/13740] Restore original install folder

2015-07-08 01:28:10 +02:00

composer.json

[ticket/14150] Update fast-image-size to newest version

2015-09-08 12:59:55 +02:00

composer.lock

[ticket/14150] Update fast-image-size to newest version

2015-09-08 12:59:55 +02:00

cron.php

…

faq.php

…

feed.php

[ticket/13645] Move the feeds to controllers

2015-08-23 22:36:10 +02:00

index.php

[ticket/12143] Replace group name output

2015-08-05 17:50:24 +02:00

mcp.php

[ticket/8708] Apply permission 'f_announce_global'

2015-07-19 21:26:47 +02:00

memberlist.php

[ticket/12143] Fix those tests

2015-08-05 17:50:26 +02:00

posting.php

Merge pull request #3781 from Elsensee/ticket/8708-2

2015-07-22 11:30:50 +02:00

report.php

…

search.php

Merge branch '3.1.x'

2015-07-23 10:20:10 +02:00

ucp.php

…

viewforum.php

…

viewonline.php

[ticket/12143] Replace group name output

2015-08-05 17:50:24 +02:00

viewtopic.php

[ticket/8708] Apply permission 'f_announce_global'

2015-07-19 21:26:47 +02:00

web.config

…