Tristan Darricau 7cc2f8aa43

Merge branch '3.1.x' into 3.2.x ...

* 3.1.x:
  [ticket/15151] Use redirected link for consistency
  [ticket/15151] ACP Cookie settings explanatory text
  [ticket/15151] ACP Cookie settings add explanatory text where it was missing

2017-04-19 17:08:16 +02:00

..

adm

Merge pull request #4705 from nomind60s/ticket/15097

2017-04-18 23:14:56 +02:00

assets

Merge branch '3.1.x' into 3.2.x

2017-04-18 23:42:28 +02:00

bin

…

cache

…

config

[ticket/14990] Move dispatcher object to the front of the options array

2017-04-16 23:40:16 +07:00

develop

…

docs

…

download

…

ext

…

files

…

images

…

includes

Merge branch '3.1.x' into 3.2.x

2017-04-19 17:08:16 +02:00

install

…

language

Merge branch '3.1.x' into 3.2.x

2017-04-19 17:08:16 +02:00

phpbb

[ticket/15163] Escape curly braces in smilies HTML attributes

2017-04-18 23:33:35 +02:00

store

…

styles

Merge pull request #4792 from Louis7777/ticket/15173

2017-04-18 23:45:25 +02:00

.htaccess

…

app.php

…

common.php

…

composer.json

…

composer.lock

Merge pull request #4786 from vinny/ticket/15158

2017-04-18 23:53:43 +02:00

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

Merge pull request #4693 from marc1706/ticket/15079

2017-04-18 23:19:54 +02:00

report.php

…

search.php

…

ucp.php

…

viewforum.php

Merge branch '3.1.x' into 3.2.x

2017-04-09 14:10:49 +02:00

viewonline.php

…

viewtopic.php

Merge pull request #4752 from nomind60s/ticket/15137

2017-03-21 16:29:10 +01:00

web.config

…