Merge branch 'master' into develop

This commit is contained in:
Torkel Ödegaard
2017-12-12 13:19:07 +01:00
63 changed files with 1588 additions and 209 deletions

View File

@@ -26,7 +26,7 @@ module.exports = function(grunt) {
});
grunt.config('copy.backend_files', {
expand: true,
src: ['conf/*', 'vendor/phantomjs/*', 'scripts/*'],
src: ['conf/**', 'vendor/phantomjs/*', 'scripts/*'],
options: { mode: true},
dest: '<%= tempDir %>'
});