From eea9a99f5a9bfc9d74646aeef6377e6a476f1182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kwa=C5=9Bniak?= <kmaciek17@gmail.com>
Date: Tue, 1 May 2018 18:09:51 +0300
Subject: [PATCH] v3.12.0

---
 .github_changelog_generator |  2 +-
 CHANGELOG.md                | 11 +++++++++++
 package-lock.json           | 28 ++++++++++++++--------------
 package.json                |  2 +-
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/.github_changelog_generator b/.github_changelog_generator
index ca57104..f05e2b3 100644
--- a/.github_changelog_generator
+++ b/.github_changelog_generator
@@ -1 +1 @@
-future-release=v3.11.1
+future-release=v3.12.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9591b0..ca7669f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Change Log
 
+## [v3.12.0](https://github.com/Exelord/ember-initials/tree/v3.12.0) (2018-05-01)
+[Full Changelog](https://github.com/Exelord/ember-initials/compare/v3.11.1...v3.12.0)
+
+**Implemented enhancements:**
+
+- Feature upgrades 3.1 [\#59](https://github.com/Exelord/ember-initials/pull/59) ([Exelord](https://github.com/Exelord))
+
+**Closed issues:**
+
+- Build Canceled: Broccoli Builder ran into an error with `Concat` plugin [\#55](https://github.com/Exelord/ember-initials/issues/55)
+
 ## [v3.11.1](https://github.com/Exelord/ember-initials/tree/v3.11.1) (2018-03-21)
 [Full Changelog](https://github.com/Exelord/ember-initials/compare/v3.11.0...v3.11.1)
 
diff --git a/package-lock.json b/package-lock.json
index 75fb8e7..654eaff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-initials",
-  "version": "3.11.1",
+  "version": "3.12.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -186,9 +186,9 @@
       }
     },
     "@ember-decorators/argument": {
-      "version": "0.8.14",
-      "resolved": "https://registry.npmjs.org/@ember-decorators/argument/-/argument-0.8.14.tgz",
-      "integrity": "sha512-sQF4M+yr5OD0ONdcCnZp38p3z/skh0wPHxhXEi79U4vstg0AyTYjqUTUtIuSFSca/RIDI589HbVaUxi6hor1fg==",
+      "version": "0.8.15",
+      "resolved": "https://registry.npmjs.org/@ember-decorators/argument/-/argument-0.8.15.tgz",
+      "integrity": "sha512-sK5y2Jjwb4v+QzvCRpspeWKnVylYY1+HQ62Di5Ub09SvGm890YHJs72pZwT5wYovkSq0J+UPRkgXwn1eSmyQDQ==",
       "dev": true,
       "requires": {
         "babel-plugin-filter-imports": "1.1.2",
@@ -3276,7 +3276,7 @@
       "integrity": "sha1-LR738hig54biFFQFYtS9F3/jLZc=",
       "dev": true,
       "requires": {
-        "colors": "1.2.1",
+        "colors": "1.2.3",
         "lodash": "3.10.1",
         "string-width": "1.0.2"
       },
@@ -3378,9 +3378,9 @@
       "dev": true
     },
     "colors": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz",
-      "integrity": "sha512-s8+wktIuDSLffCywiwSxQOMqtPxML11a/dtHE17tMn4B1MSWw/C22EKf7M2KGUBcDaVFEGT+S8N02geDXeuNKg==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.3.tgz",
+      "integrity": "sha512-qTfM2pNFeMZcLvf/RbrVAzDEVttZjFhaApfx9dplNjvHSX88Ui66zBRb/4YGob/xUWxDceirgoC1lT676asfCQ==",
       "dev": true
     },
     "combined-stream": {
@@ -5426,7 +5426,7 @@
       "integrity": "sha512-R2zEX6+QJueO5om6NFgPFR8SQhd1EHnG6casFw96rusWS3/hDqH2hD2uVwJK3BrO9vXwIR8m0dv2uqewuscNLg==",
       "dev": true,
       "requires": {
-        "@ember-decorators/argument": "0.8.14",
+        "@ember-decorators/argument": "0.8.15",
         "@ember-decorators/babel-transforms": "2.0.1",
         "babel-eslint": "8.2.3",
         "babel6-plugin-strip-class-callcheck": "6.0.0",
@@ -5660,7 +5660,7 @@
       "integrity": "sha512-y1RVXmyqrdX6zq9ZejpPt7ohKNGuLMBEKaOUyxFWcYAM5gvLuo6xFerwNmXEBbu4e3//GaoasjodXi6Cl+ddUQ==",
       "dev": true,
       "requires": {
-        "got": "8.3.0"
+        "got": "8.3.1"
       }
     },
     "ember-try": {
@@ -6751,7 +6751,7 @@
         "async": "1.5.2",
         "cheerio": "0.19.0",
         "clone": "1.0.4",
-        "colors": "1.2.1",
+        "colors": "1.2.3",
         "harmony-reflect": "1.6.0",
         "image-size": "0.4.0",
         "jimp": "0.2.28",
@@ -8148,9 +8148,9 @@
       }
     },
     "got": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-8.3.0.tgz",
-      "integrity": "sha512-kBNy/S2CGwrYgDSec5KTWGKUvupwkkTVAjIsVFF2shXO13xpZdFP4d4kxa//CLX2tN/rV0aYwK8vY6UKWGn2vQ==",
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/got/-/got-8.3.1.tgz",
+      "integrity": "sha512-tiLX+bnYm5A56T5N/n9Xo89vMaO1mrS9qoDqj3u/anVooqGozvY/HbXzEpDfbNeKsHCBpK40gSbz8wGYSp3i1w==",
       "dev": true,
       "requires": {
         "@sindresorhus/is": "0.7.0",
diff --git a/package.json b/package.json
index 2466d54..4ec4697 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ember-initials",
   "author": "Exelord",
-  "version": "3.11.1",
+  "version": "3.12.0",
   "license": "MIT",
   "homepage": "https://github.com/Exelord/ember-initials#readme",
   "description": "Simple Initails Avatars for Ember 2 applications",