Marc Alexander 03c64d3384 Merge branch '3.1.x' ...

Conflicts:
	phpBB/includes/mcp/mcp_forum.php

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

..

adm

Merge branch '3.1.x'

2015-08-08 22:40:40 +02:00

assets

Merge branch '3.1.x'

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

bin

[ticket/13740] Use language service in console application

2015-07-24 18:05:10 +02:00

cache

…

config

Merge branch '3.1.x'

2015-08-08 22:23:03 +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-08-09 10:08:06 +02:00

download

[ticket/13770] Wither interface for container_builder

2015-05-14 23:04:03 +02:00

ext

…

files

…

images

…

includes

Merge branch '3.1.x'

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

install

Merge pull request #3698 from s9e/ticket/13935

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

install_new

[ticket/14052] Translate installer commands

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

language

Merge remote-tracking branch 'Nicofuma/ticket/12692'

2015-08-07 10:07:45 +02:00

phpbb

Merge branch '3.1.x'

2015-08-09 10:00:34 +02:00

store

…

styles/prosilver

Merge branch '3.1.x'

2015-08-09 10:08:06 +02:00

.htaccess

…

app.php

…

common.php

[ticket/13740] Restore original install folder

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

composer.json

Merge branch '3.1.x'

2015-05-30 10:58:40 +02:00

composer.lock

[ticket/14015] Update Symfony

2015-07-17 09:51:49 +02:00

cron.php

…

faq.php

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

feed.php

…

index.php

[ticket/11444] Moving the in-board notifications to a method class

2015-07-13 22:41:13 +02:00

mcp.php

[ticket/8708] Apply permission 'f_announce_global'

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

memberlist.php

…

posting.php

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

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

report.php

[ticket/13654] Moving reporting into controller

2015-04-16 11:29:11 +02:00

search.php

Merge branch '3.1.x'

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

ucp.php

…

viewforum.php

…

viewonline.php

[ticket/13844] FAQ in new controller format

2015-05-16 22:09:05 +02:00

viewtopic.php

[ticket/8708] Apply permission 'f_announce_global'

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

web.config

…