mastofe

commit: 6917099a6a0b89e20ecb0f54949a49285ab32d5d
parent: 7b9f8766e88dceb9519085deada3fa673e4c015b
Author: Eugen <eugen@zeonfederated.com>
Date:   Fri,  6 Jan 2017 01:13:34 +0100

Merge pull request #418 from ticky/upgrade-emojione

Upgrade EmojiOne to 2.2.7
Diffstat:
M
package.json
3
+++
M
yarn.lock
10
+++++-----

2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
@@ -53,5 +53,8 @@
     "sass-loader": "^4.0.2",
     "sinon": "^1.17.6",
     "style-loader": "^0.13.1"
+  },
+  "dependencies": {
+    "emojione": "latest"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -1935,9 +1935,9 @@ elliptic@^6.0.0:
     hash.js "^1.0.0"
     inherits "^2.0.1"
 
-emojione:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/emojione/-/emojione-2.2.6.tgz#67dec452937d5b14ee669207ea41cdb1f69fb8f6"
+emojione@latest:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/emojione/-/emojione-2.2.7.tgz#46457cf6b9b2f8da13ae8a2e4e547de06ee15e96"
 
 emojis-list@^2.0.0:
   version "2.1.0"
@@ -2368,7 +2368,7 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
-glob@7.0.5, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5:
+glob@7.0.5, glob@^7.0.0, glob@^7.0.3:
   version "7.0.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.5.tgz#b4202a69099bbb4d292a7c1b95b6682b67ebdc95"
   dependencies:
@@ -2389,7 +2389,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@~7.1.1:
+glob@^7.0.5, glob@~7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
   dependencies: