Tristan Darricau 02469d4691 Merge branch 'ticket/13683' into ticket/13683-3.2.x ...

* ticket/13683:
  [ticket/13683] Fix CS

2016-04-03 16:27:08 +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 pull request #4251 from marc1706/ticket/14272-3.2.x

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

install

Merge pull request #4245 from JoshyPHP/ticket/14381

2016-03-25 11:03:27 +01:00

language

[ticket/14329] Add missing ACP language vars

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

phpbb

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

2016-04-03 16:27:08 +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

…

composer.lock

…

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

Merge branch '3.1.x' into 3.2.x

2016-03-25 11:20:56 +01: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

…

viewtopic.php

Merge pull request #4190 from marc1706/ticket/14437

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

web.config

…