Marc Alexander 450e5b36b8 Merge branch '3.1.x' into 3.2.x ...

Conflicts:
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/mcp_forum.html
	phpBB/styles/subsilver2/template/search_results.html
	phpBB/styles/subsilver2/template/viewforum_body.html

2016-06-19 18:07:29 +02:00

..

adm

Merge branch '3.1.x' into 3.2.x

2016-05-31 21:43:19 +02:00

assets

Merge pull request #4021 from marc1706/ticket/14272

2016-03-27 13:34:17 +02:00

bin

[ticket/13616] Fix UI tests

2016-04-03 16:23:16 +02:00

cache

…

config

Merge pull request #4236 from Nicofuma/ticket/13616

2016-04-13 10:11:24 +02:00

develop

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

docs

Merge branch '3.1.x' into 3.2.x

2016-06-19 18:07:29 +02:00

download

…

ext

…

files

…

images

…

includes

Merge branch '3.1.x' into 3.2.x

2016-06-19 17:54:55 +02:00

install

[ticket/14607] Add missing auto_increment to report_id

2016-05-01 17:29:10 +02:00

language

[ticket/13969] Remove obsolute language files

2016-04-28 21:33:36 +02:00

phpbb

Merge pull request #4346 from lavigor/ticket/14661

2016-06-08 20:47:14 +02:00

store

…

styles

Merge branch '3.1.x' into 3.2.x

2016-06-19 18:07:29 +02:00

.htaccess

[ticket/14458] Explicitly state RewriteBase into .htaccess root file

2016-02-07 14:46:45 +01:00

app.php

…

common.php

[ticket/13616] Fix UI tests

2016-04-03 16:23:16 +02:00

composer.json

[ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer

2016-04-03 16:22:07 +02:00

composer.lock

[ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer

2016-04-03 16:22:07 +02:00

cron.php

Merge branch '3.1.x' into 3.2.x

2016-05-28 09:59:50 +02:00

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

Merge branch '3.1.x' into 3.2.x

2016-03-30 10:04:33 +02:00

posting.php

Merge branch '3.1.x' into 3.2.x

2016-04-03 16:34:43 +02:00

report.php

…

search.php

Merge branch '3.1.x' into 3.2.x

2016-06-19 17:46:12 +02:00

ucp.php

…

viewforum.php

Merge branch '3.1.x' into 3.2.x

2016-03-27 12:37:27 +02:00

viewonline.php

Merge branch '3.1.x' into 3.2.x

2016-02-13 18:08:01 +01:00

viewtopic.php

Merge pull request #4190 from marc1706/ticket/14437

2016-03-25 11:48:29 +01:00

web.config

[ticket/14587] Remove sectionGroup from web.config

2016-04-07 17:20:34 -04:00