Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Julian Lam
2018-02-16 21:23:25 -05:00
80 changed files with 642 additions and 281 deletions

View File

@@ -233,6 +233,7 @@ Controllers.robots = function (req, res) {
} else {
res.send('User-agent: *\n' +
'Disallow: ' + nconf.get('relative_path') + '/admin/\n' +
'Disallow: ' + nconf.get('relative_path') + '/reset/\n' +
'Sitemap: ' + nconf.get('url') + '/sitemap.xml');
}
};