Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-07 01:05:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-02-03 10:04:49 -05:00
parent 6b9bafc6cd 70b20e3ff1
commit bfd16d188e
67 changed files with 466 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/mocks/databasemock.js
View File

@@ -143,7 +143,7 @@
nconf.set('theme_config', path.join(nconf.get('themes_path'), 'nodebb-theme-persona', 'theme.json'));
nconf.set('bcrypt_rounds', 1);
require('../../build').buildTargets(['js', 'clientCSS', 'acpCSS', 'tpl'], next);
require('../../build').buildAll(next);
},
function (next) {
var webserver = require('../../src/webserver');