Tristan Darricau 57b122cc16

Merge branch '3.2.x' ...

* 3.2.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:28 +02:00

..

adm

Merge branch '3.2.x'

2017-04-18 23:15:10 +02:00

assets

Merge branch '3.2.x'

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

bin

…

cache

…

config

Merge branch '3.2.x'

2017-04-16 19:41:19 +02:00

develop

[ticket/15307] fix for good!

2017-01-23 22:41:08 -05:00

docs

Merge branch '3.2.x'

2017-03-08 21:24:51 +01:00

download

Merge branch '3.1.x' into 3.2.x

2017-02-11 21:48:20 +01:00

ext

…

files

…

images

[ticket/15037] Optimize what can be

2017-01-24 17:15:41 -05:00

includes

Merge branch '3.2.x'

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

install

[ticket/15154] Load compatibility globals into the CLI installer

2017-03-26 23:40:24 -07:00

language

Merge branch '3.2.x'

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

phpbb

Merge branch '3.2.x'

2017-04-18 23:37:01 +02:00

store

…

styles

Merge branch '3.2.x'

2017-04-18 23:49:00 +02:00

.htaccess

…

app.php

…

common.php

[ticket/11076] Also state min PHP version when visiting forum website

2017-01-20 21:23:40 +01:00

composer.json

[ticket/15153] Update to newer homestead for vagrant

2017-03-26 16:31:59 -07:00

composer.lock

Merge branch '3.2.x'

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

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

[ticket/13429] Replace @change with @changed

2017-01-23 13:33:15 +01:00

posting.php

Merge pull request #4693 from marc1706/ticket/15079

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

report.php

…

search.php

[ticket/13429] Replace @change with @changed

2017-01-23 13:33:15 +01:00

ucp.php

…

viewforum.php

Merge branch '3.1.x' into 3.2.x

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

viewonline.php

Merge branch '3.2.x'

2017-02-11 21:48:42 +01:00

viewtopic.php

Merge pull request #4752 from nomind60s/ticket/15137

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

web.config

…