Tristan Darricau 3dfc882d1a

Merge pull request #4668 from marc1706/ticket/15015 ...

[ticket/15015] Use correct explain string for enable email settings

* marc1706/ticket/15015:
  [ticket/15015] Use correct explain string for enable email settings

2017-01-22 23:06:49 +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

[ticket/12610] CS

2016-12-03 16:37:35 +01:00

cache

…

config

Merge branch 'ticket/14957' into ticket/14957-rhea

2017-01-03 21:41:36 +01:00

develop

…

docs

[ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2

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

download

…

ext

[ticket/12610] Correctly handle empty cache

2016-12-03 16:37:36 +01:00

files

…

images

…

includes

Merge branch '3.1.x' into 3.2.x

2017-01-15 18:13:00 +01:00

install

Merge pull request #4658 from kasimi/ticket/15035

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

language

Merge branch '3.1.x' into 3.2.x

2017-01-15 18:13:00 +01:00

phpbb

[ticket/15015] Use correct explain string for enable email settings

2017-01-22 20:58:53 +01:00

store

…

styles

[ticket/15023] Fix for linting

2017-01-16 12:34:59 -05:00

.htaccess

…

app.php

…

common.php

…

composer.json

[ticket/15016] Fixed an issue with some parentheses in smilies

2017-01-15 11:24:15 +01:00

composer.lock

[ticket/15040] Updated s9e\TextFormatter to 0.9.1

2017-01-22 19:11:17 +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

…