Tristan Darricau 34866b2db1 Merge branch '3.2.x' ...

* 3.2.x:
  [ticket/15015] Use correct explain string for enable email settings

2017-01-22 23:06:53 +01:00

..

adm

Merge branch '3.1.x' into 3.2.x

2017-01-14 14:59:04 +01:00

assets

[ticket/14961] Add cookie notice as enablable feature

2017-01-06 00:57:12 +01:00

bin

…

cache

…

config

Merge branch '3.2.x'

2017-01-04 17:30:05 +01:00

develop

…

docs

Merge branch '3.2.x'

2017-01-07 00:20:22 +01:00

download

…

ext

…

files

…

images

…

includes

Merge branch '3.2.x'

2017-01-15 18:16:45 +01:00

install

Merge branch '3.2.x'

2017-01-21 11:56:21 +01:00

language

Merge branch '3.2.x'

2017-01-15 18:16:45 +01:00

phpbb

Merge branch '3.2.x'

2017-01-22 23:06:53 +01:00

store

…

styles

Merge branch '3.2.x'

2017-01-17 21:55:09 +01:00

.htaccess

…

app.php

…

common.php

…

composer.json

Merge branch '3.2.x'

2017-01-15 14:06:13 +01:00

composer.lock

Merge branch '3.2.x'

2017-01-22 23:00:12 +01:00

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

[ticket/14962] Introduces a new helper to check emptyness of bbcode texts

2017-01-06 21:40:31 +01:00

report.php

…

search.php

…

ucp.php

…

viewforum.php

Merge branch '3.1.x' into 3.2.x

2016-12-28 22:15:26 +01:00

viewonline.php

…

viewtopic.php

Merge branch '3.1.x' into 3.2.x

2016-12-11 19:51:56 +01:00

web.config

…