Merge branch 'develop' into api-v3

This commit is contained in:
Blade Barringer
2016-03-04 12:16:22 -06:00
55 changed files with 133 additions and 102 deletions

View File

@@ -75,7 +75,7 @@ gulp.task('test:prepare:server', ['test:prepare:mongo'], () => {
}
});
gulp.task('test:prepare:build', (cb) => {
gulp.task('test:prepare:build', ['build'], (cb) => {
exec(testBin('grunt build:test'), cb);
});