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

..

acp

Merge branch '3.1.x' into 3.2.x

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

diff

…

hooks

…

mcp

Merge branch '3.1.x' into 3.2.x

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

questionnaire

[ticket/14492] Don't explicitly pass data providers by refs

2016-12-03 14:23:34 +01:00

ucp

Merge branch '3.1.x' into 3.2.x

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

utf

…

.htaccess

…

bbcode.php

[ticket/13616] Updates direct call to twig environment constructor

2016-04-03 16:23:16 +02:00

compatibility_globals.php

…

constants.php

[3.2.x] Update development version to 3.2.1-dev

2017-01-07 17:19:35 +01:00

functions_acp.php

[ticket/14492] Add basic layout for enabling viglink

2016-12-03 14:20:28 +01:00

functions_admin.php

[ticket/13429] Replace @change with @changed

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

functions_compatibility.php

…

functions_compress.php

…

functions_content.php

Merge branch '3.1.x' into 3.2.x

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

functions_convert.php

[ticket/14739] Remove SQLite 2.8.x database driver

2016-11-16 17:59:28 +01:00

functions_database_helper.php

…

functions_display.php

Merge branch '3.2.x'

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

functions_download.php

Merge branch '3.1.x' into 3.2.x

2016-12-28 22:23:52 +01:00

functions_jabber.php

…

functions_mcp.php

…

functions_messenger.php

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

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

functions_module.php

…

functions_posting.php

Merge branch '3.2.x'

2017-03-25 16:37:37 +01:00

functions_privmsgs.php

Merge pull request #4443 from Crizz0/ticket/14780

2017-01-04 21:07:32 +01:00

functions_transfer.php

…

functions_user.php

Merge branch '3.1.x' into 3.2.x

2017-02-22 11:09:02 +01:00

functions.php

[ticket/13429] Replace @change with @changed

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

index.htm

…

message_parser.php

Merge branch '3.1.x' into 3.2.x

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

sphinxapi.php

…

startup.php

…