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

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

Browse Source
This commit is contained in:
Julian Lam
2017-02-07 16:03:54 -05:00
parent b5daedb7a3 107abe3197
commit 8a0a74d95e
78 changed files with 649 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/mocks/databasemock.js
View File

@@ -20,7 +20,7 @@
base_dir: path.join(__dirname,'../..'),
themes_path: path.join(__dirname, '../../node_modules'),
upload_url: path.join(path.sep, '../../uploads', path.sep),
views_dir: path.join(__dirname, '../../public/templates'),
views_dir: path.join(__dirname, '../../build/public/templates'),
relative_path: ''
});