Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Yannick Gagnon committed Apr 11, 2016
2 parents 507468e + 3d35bd3 commit fdcdd13
Show file tree
Hide file tree
Showing 94 changed files with 6,795 additions and 6,436 deletions.
6 changes: 1 addition & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@ module.exports = function(grunt) {
},
'sass': {
files: ['themes/**/*.scss'],
tasks: ['sass'],
},
'css': {
files: ['dist/css/*.css'],
tasks: ['postcss', 'dataUri'],
tasks: ['sass','postcss', 'dataUri'],
},
'tests': {
options: {
Expand Down
Loading

0 comments on commit fdcdd13

Please sign in to comment.