Skip to content

Commit

Permalink
Merge branch 'master' of github.com:RegisBiron/my-grunt-file
Browse files Browse the repository at this point in the history
  • Loading branch information
Regis Biron committed Nov 6, 2014
2 parents d467818 + 8a10910 commit 7322eed
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ module.exports = function (grunt) {
}
},

concat: {
concat: {
dist: {
src: [
'<%= config.dev %>/scripts/*.js'
Expand All @@ -140,6 +140,14 @@ module.exports = function (grunt) {
}
},

//Include wiredep when working with Bower
// wiredep: {
// app: {
// src: ['index.html'],
// exclude: ['bower_components/modernizr/modernizr.js']
// }
// },

responsive_images: {
dist: {
options: {
Expand Down Expand Up @@ -173,6 +181,6 @@ module.exports = function (grunt) {
]);

grunt.registerTask('default', [

]);
};

0 comments on commit 7322eed

Please sign in to comment.