diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-30 15:07:27 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-30 15:07:27 +0200 |
| commit | 30964350b2ce3e2639e38fb25acf268c065b0bc5 (patch) | |
| tree | 328a69859cf55572899d673ddc40fa598b23ac46 /yarn.lock | |
| parent | 35933167c0c84033d062a6cc73213fc4c222e4d3 (diff) | |
| parent | de22c202f5e103f433926c763fc3ae179d5976ad (diff) | |
Merge branch 'master' into development
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/yarn.lock b/yarn.lock index 0904354e9..6a3a36270 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2297,7 +2297,7 @@ emojione-picker@^2.0.1: react-virtualized "^8.11.4" store "^1.3.20" -emojione@^2.2.6, emojione@latest: +emojione@^2.2.6, emojione@^2.2.7: version "2.2.7" resolved "https://registry.yarnpkg.com/emojione/-/emojione-2.2.7.tgz#46457cf6b9b2f8da13ae8a2e4e547de06ee15e96" |