From 3293b44e1e52d09dbafde0f49b11fbe531c0f8c6 Mon Sep 17 00:00:00 2001
From: Eliot Whalan <ewhal@pantsu.cat>
Date: Tue, 14 Jun 2016 17:00:31 +1000
Subject: Revert "Remove grunt-contrib-imagemin image minification"

This reverts commit 90e6b7bdfeccff5e96f0bda23bc5c9ab7b33238a.
---
 Gruntfile.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'Gruntfile.js')

diff --git a/Gruntfile.js b/Gruntfile.js
index 26209b1..0cb7d9c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -63,6 +63,16 @@ module.exports = function (grunt) {
         }
       }
     },
+    imagemin: {
+      dist: {
+        files: [{
+          expand: true,
+          cwd: 'img/',
+          src: '**/*.{png,jpg,gif}',
+          dest: 'dist/img/'
+        }]
+      }
+    },
     copy: {
       dist: {
         files: [{
@@ -85,7 +95,12 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-htmlmin');
   grunt.loadNpmTasks('grunt-contrib-cssmin');
+  grunt.loadNpmTasks('grunt-contrib-imagemin');
   grunt.loadNpmTasks('grunt-contrib-copy');
 
+<<<<<<< HEAD
   grunt.registerTask('default', ['swig', 'htmlmin', 'cssmin', 'uglify', 'copy']);
+=======
+  grunt.registerTask('default', ['mkdir', 'swig', 'htmlmin', 'cssmin', 'uglify', 'imagemin', 'copy']);
+>>>>>>> parent of 90e6b7b... Remove grunt-contrib-imagemin image minification
 };
-- 
cgit v1.2.3