From: Marius Gavrilescu <marius@ieval.ro>
Date: Wed, 22 Apr 2015 07:24:09 +0000 (+0300)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?p=gruntmaster-page.git;a=commitdiff_plain;h=6f5debb62f9d49098b660b626890a46dbbf7346f

Merge branch 'master' into newmc

Conflicts:
	make_static.PL
---

6f5debb62f9d49098b660b626890a46dbbf7346f
diff --cc make_static.PL
index 24e56a8,9fd5bca..06c9eee
--- a/make_static.PL
+++ b/make_static.PL
@@@ -6,7 -6,7 +6,8 @@@ use CSS::Minifier::XS qw/minify/
  use Digest::SHA qw/sha256_base64/;
  use IO::Compress::Gzip qw/gzip/;
  use File::Slurp qw/read_file write_file edit_file_lines/;
 +use SVG::SpriteMaker;
+ use File::Which;
  use List::Util qw/first/;
  
  mkdir 'static';