Marc Alexander 2e3f89444a Merge branch 'ticket/14136' into ticket/14136-3.2.x ...

Conflicts:
	phpBB/adm/style/install_update_diff.html
	phpBB/adm/style/installer_header.html
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html

2016-03-24 16:12:56 +01:00

..

adm

Merge branch 'ticket/14136' into ticket/14136-3.2.x

2016-03-24 16:12:56 +01:00

assets

Merge branch '3.1.x' into 3.2.x

2016-03-10 22:11:07 +01:00

bin

Merge branch '3.1.x'

2016-01-15 11:18:13 +01:00

cache

…

config

[ticket/14523] Replace prototype definition with shared services

2016-03-10 10:41:00 +01:00

develop

[ticket/13454] Remove unused variables

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

docs

Merge branch 'ticket/14136' into ticket/14136-3.2.x

2016-03-24 16:12:56 +01:00

download

Merge branch '3.1.x'

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

ext

…

files

…

images

…

includes

Merge branch 'ticket/14136' into ticket/14136-3.2.x

2016-03-24 16:12:56 +01:00

install

[ticket/14136] Add back X-UA-Compatible meta tag

2016-03-24 16:07:07 +01:00

language

Merge branch '3.1.x' into 3.2.x

2016-03-05 12:12:27 +01:00

phpbb

Merge branch 'ticket/14136' into ticket/14136-3.2.x

2016-03-24 16:12:56 +01:00

store

…

styles

Merge branch 'ticket/14136' into ticket/14136-3.2.x

2016-03-24 16:12:56 +01:00

.htaccess

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

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

app.php

…

common.php

[ticket/14177] Uses Symfony's Debug ErrorHandler in development environment

2015-12-11 21:05:53 +01:00

composer.json

[ticket/14457] Replaces unique_id implementation by random_bytes()

2016-02-18 17:30:31 +01:00

composer.lock

[ticket/14538] Update dependencies for 3.2.x

2016-03-15 13:37:26 +01: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'

2016-01-23 12:04:43 +01:00

posting.php

[ticket/13972] Remove hard coded flood check from posting

2016-03-10 06:48:36 -05:00

report.php

…

search.php

[ticket/14234] Get rid of undefined variables

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

ucp.php

…

viewforum.php

Merge branch '3.1.x' into 3.2.x

2016-03-24 15:22:38 +01:00

viewonline.php

Merge branch '3.1.x' into 3.2.x

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

viewtopic.php

Merge branch '3.1.x' into 3.2.x

2016-03-24 11:21:31 +01:00

web.config

[ticket/13842] Prevent internal server errors without rewrite module on IIS

2016-02-19 17:01:58 +01:00