Joas Schilling 7f7b09fdeb Merge branch '3.1.x' ...

Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/acp/acp_bbcodes.php

2016-01-09 18:45:32 +01:00

..

adm

Merge branch '3.1.x'

2016-01-08 16:39:33 +01:00

assets

[ticket/14310] Put progress percentage inside span and make more visible

2015-12-07 16:51:39 +01:00

bin

Merge pull request #3857 from Nicofuma/ticket/14124

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

cache

…

config

[ticket/14250] Change token_storage class to fit changed interface

2016-01-04 03:38:28 +01:00

develop

[ticket/13454] Remove unused variables

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

docs

Merge branch '3.1.x'

2016-01-09 18:45:32 +01:00

download

Merge branch '3.1.x'

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

ext

…

files

…

images

…

includes

Merge branch '3.1.x'

2016-01-09 18:45:32 +01:00

install

[prep-release-3.1.7] Update version to 3.1.7-pl1

2016-01-09 09:35:03 +01:00

language

Merge branch '3.1.x'

2015-12-26 22:10:41 +01:00

phpbb

Merge branch '3.1.x'

2016-01-09 18:45:32 +01:00

store

…

styles

Merge branch '3.1.x'

2016-01-08 16:39:33 +01:00

.htaccess

…

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/14382] Specify the branch-alias in the composer.json files

2016-01-09 15:42:42 +01:00

composer.lock

[ticket/14250] Added symfony/debug as requirement

2016-01-06 16:06:27 +01:00

cron.php

…

faq.php

…

feed.php

[ticket/13645] Move the feeds to controllers

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

index.php

Merge branch '3.1.x'

2015-11-12 09:11:37 +01:00

mcp.php

[ticket/8708] Apply permission 'f_announce_global'

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

memberlist.php

Merge branch '3.1.x'

2015-11-26 14:45:36 +01: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

Merge branch '3.1.x'

2015-11-24 21:46:01 +01:00

viewonline.php

Merge branch '3.1.x'

2015-10-12 09:20:13 +02:00

viewtopic.php

Merge branch '3.1.x'

2015-11-26 14:27:57 +01:00

web.config

…