Tristan Darricau 2a7c514cd0 Merge branch '3.1.x' into 3.2.x ...

* 3.1.x:
  [ticket/14437] Make sure attachments array is properly ordered before processing
  [ticket/14437] Preserve attachment ID order by ordering by attach_id
  [ticket/14437] Sort attachments after assigning inline attachments
  [ticket/14437] Correctly assume index from attachment display order

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

..

adm

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

2016-03-24 16:12:56 +01:00

assets

Merge branch '3.1.x' into 3.2.x

2016-03-10 22:11:07 +01:00

bin

Merge branch '3.1.x'

2016-01-15 11:18:13 +01:00

cache

…

config

[ticket/14555] Uniformize cache directory usages

2016-03-24 09:15:34 +01:00

develop

[ticket/13454] Remove unused variables

2016-01-06 13:52:11 +01:00

docs

Merge pull request #4193 from marc1706/ticket/14497

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

download

…

ext

…

files

…

images

…

includes

Merge branch '3.1.x' into 3.2.x

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

install

Merge pull request #4245 from JoshyPHP/ticket/14381

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

language

Merge branch '3.1.x' into 3.2.x

2016-03-25 11:43:05 +01:00

phpbb

Merge branch '3.1.x' into 3.2.x

2016-03-25 11:43:05 +01:00

store

…

styles

Merge pull request #4245 from JoshyPHP/ticket/14381

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

.htaccess

[ticket/14458] Explicitly state RewriteBase into .htaccess root file

2016-02-07 14:46:45 +01:00

app.php

…

common.php

[ticket/14177] Uses Symfony's Debug ErrorHandler in development environment

2015-12-11 21:05:53 +01: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

Merge branch '3.1.x'

2015-11-12 09:11:37 +01:00

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-24 17:22:07 +01:00

viewonline.php

Merge branch '3.1.x' into 3.2.x

2016-02-13 18:08:01 +01:00

viewtopic.php

Merge branch '3.1.x' into 3.2.x

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