Merge branch 'develop'

This commit is contained in:
peteruithoven 2017-06-23 12:36:16 +02:00
commit f8032d7411
1 changed files with 2 additions and 2 deletions

View File

@ -48,9 +48,9 @@ define Build/Compile
# grunt can access git info
npm install
ifeq ($(CONFIG_DOODLE3D_CLIENT_MINIFY_JS),y)
grunt gitinfo less autoprefixer cssmin concat uglify
grunt gitinfo template less autoprefixer cssmin concat uglify
else
grunt gitinfo less autoprefixer cssmin concat
grunt gitinfo template less autoprefixer cssmin concat
endif
# Copy compiled files to build dir
$(CP) www $(PKG_BUILD_DIR)/