Marc Alexander 2653b98e09 Merge branch 'ticket/14577' into ticket/14577-3.2.x ...

Conflicts:
	phpBB/includes/acp/acp_modules.php

2016-04-02 09:51:37 +02:00

..

adm

Merge pull request #4021 from marc1706/ticket/14272

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

assets

Merge pull request #4021 from marc1706/ticket/14272

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

bin

…

cache

…

config

Merge pull request #4199 from VSEphpbb/ticket/12684

2016-03-26 19:38:58 +01:00

develop

…

docs

Merge pull request #4193 from marc1706/ticket/14497

2016-03-25 11:46:15 +01:00

download

…

ext

…

files

…

images

…

includes

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

2016-04-02 09:51:37 +02:00

install

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

2016-04-02 09:51:37 +02:00

language

[ticket/14329] Add missing ACP language vars

2016-03-27 06:54:50 -04:00

phpbb

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

2016-04-02 09:51:37 +02:00

store

…

styles

Merge pull request #4021 from marc1706/ticket/14272

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

.htaccess

…

app.php

…

common.php

Merge branch '3.1.x' into 3.2.x

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

composer.json

[ticket/14495] Updates the version to 3.3.0-a1-dev

2016-02-24 22:25:41 +01:00

composer.lock

Merge branch '3.2.x'

2016-03-15 20:25:55 +01:00

cron.php

…

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-03-25 11:48:29 +01:00

report.php

…

search.php

…

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/13842] Prevent internal server errors without rewrite module on IIS

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