diff options
| author | eal <eal@waifu.club> | 2017-12-07 17:08:20 +0000 |
|---|---|---|
| committer | eal <eal@waifu.club> | 2017-12-07 17:08:20 +0000 |
| commit | 63d29eab3f0e399e8a3b1bbfa35f1717715ffc63 (patch) | |
| tree | bc0884dff5f19fc69d0248dca141f0f5f6d5eba0 /yarn.lock | |
| parent | bf7b5a7105e6543411d83ba126dab6b00955c98c (diff) | |
| parent | ecb8acb155a77092b0661854b0ca4cf3c19ff56e (diff) | |
Merge branch 'feature/chat' into 'develop'
Feature/chat
See merge request pleroma/pleroma-fe!182
Diffstat (limited to 'yarn.lock')
| -rw-r--r-- | yarn.lock | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -4226,6 +4226,10 @@ phantomjs-prebuilt@^2.1.3, phantomjs-prebuilt@^2.1.7: request-progress "~2.0.1" which "~1.2.10" +phoenix@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/phoenix/-/phoenix-1.3.0.tgz#1df2c27f986ee295e37c9983ec28ebac1d7f4a3e" + pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" |