summaryrefslogtreecommitdiff
path: root/mix.lock
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-03 10:08:07 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-03 10:08:07 +0300
commit509c81e4b10bd8ba6d3a93889cd6fbbbfbcbab21 (patch)
tree6939fe33f705c384bdf2bc05a348be02b64ec3fc /mix.lock
parentf987d83885eef7cd8d114feefe8870a8c5e841c6 (diff)
parent4c02e049358441529c54a72cd11f1c81ee897d49 (diff)
downloadpleroma-509c81e4b10bd8ba6d3a93889cd6fbbbfbcbab21.tar.gz
pleroma-509c81e4b10bd8ba6d3a93889cd6fbbbfbcbab21.zip
Merge branch 'develop' into gun
Diffstat (limited to 'mix.lock')
-rw-r--r--mix.lock1
1 files changed, 1 insertions, 0 deletions
diff --git a/mix.lock b/mix.lock
index 8b5c61895..255b4888b 100644
--- a/mix.lock
+++ b/mix.lock
@@ -112,3 +112,4 @@
"web_push_encryption": {:hex, :web_push_encryption, "0.2.3", "a0ceab85a805a30852f143d22d71c434046fbdbafbc7292e7887cec500826a80", [:mix], [{:httpoison, "~> 1.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: false]}, {:poison, "~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm", "9315c8f37c108835cf3f8e9157d7a9b8f420a34f402d1b1620a31aed5b93ecdf"},
"websocket_client": {:git, "https://github.com/jeremyong/websocket_client.git", "9a6f65d05ebf2725d62fb19262b21f1805a59fbf", []},
}
+