summaryrefslogtreecommitdiff
path: root/mix.lock
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-03-02 07:58:01 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-03-02 07:58:01 +0000
commit764a50f8a671cca69ca1f616754660506f8c18d8 (patch)
tree998fea663c91daf6515c879079a3c0a9fa0f5ad5 /mix.lock
parent6ceef768cba23ab79a5545330746c7d8ce97ed64 (diff)
parent34f1d09f3abffd97672832382e48bb8d7f178e90 (diff)
downloadpleroma-764a50f8a671cca69ca1f616754660506f8c18d8.tar.gz
pleroma-764a50f8a671cca69ca1f616754660506f8c18d8.zip
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
ActivityPub actions & side-effects in transaction Closes #1482 See merge request pleroma/pleroma!2089
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 55c29cdab..c8b30a6f9 100644
--- a/mix.lock
+++ b/mix.lock
@@ -110,3 +110,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", []},
}
+