Auto-merged master into adding-igor-carmen-maren-buck on deployment.

2016-04-12 17:02:56 +02:00 · 2016-04-12 17:02:56 +02:00 · 575d78e38d
commit 575d78e38d
parent d6d1b7c738 67104fc1f1
1 changed files with 1 additions and 0 deletions
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@ -10,6 +10,7 @@ module.exports = function(defaults) {
    fingerprint = false;
  } else {
    fingerprint = {
+      exclude: ['images/emoji'],
      extensions: ['js', 'css', 'png', 'jpg', 'gif', 'map', 'svg']
    };