diff options
| author | lambda <lain@soykaf.club> | 2019-05-07 14:43:21 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-07 14:43:21 +0000 |
| commit | 238dd72fad2452a8da594e68b8e6c80d709587e8 (patch) | |
| tree | 050a8e55ae39047e197b0e84c9fed8bacaf91545 /mix.lock | |
| parent | 6518644db1d31f2b30b95fa0899b3751bc330d56 (diff) | |
| parent | c42ded13a2caa02f3f5aa00accce69b183546f9e (diff) | |
| download | pleroma-238dd72fad2452a8da594e68b8e6c80d709587e8.tar.gz pleroma-238dd72fad2452a8da594e68b8e6c80d709587e8.zip | |
Merge branch 'conversations_three' into 'develop'
Conversations once more.
See merge request pleroma/pleroma!1119
Diffstat (limited to 'mix.lock')
| -rw-r--r-- | mix.lock | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -46,7 +46,7 @@ "mime": {:hex, :mime, "1.3.1", "30ce04ab3175b6ad0bdce0035cba77bba68b813d523d1aac73d9781b4d193cf8", [:mix], [], "hexpm"}, "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm"}, "mochiweb": {:hex, :mochiweb, "2.15.0", "e1daac474df07651e5d17cc1e642c4069c7850dc4508d3db7263a0651330aacc", [:rebar3], [], "hexpm"}, - "mock": {:hex, :mock, "0.3.1", "994f00150f79a0ea50dc9d86134cd9ebd0d177ad60bd04d1e46336cdfdb98ff9", [:mix], [{:meck, "~> 0.8.8", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm"}, + "mock": {:hex, :mock, "0.3.3", "42a433794b1291a9cf1525c6d26b38e039e0d3a360732b5e467bfc77ef26c914", [:mix], [{:meck, "~> 0.8.13", [hex: :meck, repo: "hexpm", optional: false]}], "hexpm"}, "mogrify": {:hex, :mogrify, "0.6.1", "de1b527514f2d95a7bbe9642eb556061afb337e220cf97adbf3a4e6438ed70af", [:mix], [], "hexpm"}, "nimble_parsec": {:hex, :nimble_parsec, "0.5.0", "90e2eca3d0266e5c53f8fbe0079694740b9c91b6747f2b7e3c5d21966bba8300", [:mix], [], "hexpm"}, "parse_trans": {:hex, :parse_trans, "3.3.0", "09765507a3c7590a784615cfd421d101aec25098d50b89d7aa1d66646bc571c1", [:rebar3], [], "hexpm"}, |