Julian Lam 7089e5c6a6 Merge remote-tracking branch 'origin/master' into develop

2018-04-24 11:55:17 -04:00

..

admin

added post usage column to uploads ACP page

2018-04-17 11:25:11 -04:00

emails

closes #6347

2018-03-08 12:18:02 -05:00

install

Remove external sources from installer page (#6101)

2017-11-23 10:50:10 -05:00

modals

Use ACP profile image dimension setting in cropper

2017-02-19 08:30:30 +00:00

partials

Added user consent pages (#6430)

2018-04-09 12:23:53 -04:00

400.tpl

Revert "Merge pull request #5923 from NodeBB/patch-5922"

2017-09-11 15:37:18 -04:00

403.tpl

Revert "Merge pull request #5923 from NodeBB/patch-5922"

2017-09-11 15:37:18 -04:00

404.tpl

{config.relative_path} instead of {relative_path}

2015-05-15 15:00:48 -04:00

500-embed.tpl

normalising behaviour for subfolder installs, #6410

2018-04-23 16:05:37 -04:00

500.tpl

Revert "Merge pull request #5923 from NodeBB/patch-5922"

2017-09-11 15:37:18 -04:00

503.tpl

closes #3519

2015-08-28 15:08:21 -04:00

sitemap.tpl

Squashed commit of the following:

2015-10-27 05:25:14 -04:00