projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix-tests' into 'develop'
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 334fabb33985ac67735ba4b3e85a5b853f8de762..dfa53035886ac410227665d82a1af1fa38be4048 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-95,7
+95,7
@@
defmodule Pleroma.Mixfile do
defp deps do
[
{:phoenix, "~> 1.4.8"},
defp deps do
[
{:phoenix, "~> 1.4.8"},
- {:tzdata, "~>
1.0
"},
+ {:tzdata, "~>
0.5.21
"},
{:plug_cowboy, "~> 2.0"},
{:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 4.0"},
{:plug_cowboy, "~> 2.0"},
{:phoenix_pubsub, "~> 1.1"},
{:phoenix_ecto, "~> 4.0"},
@@
-125,7
+125,7
@@
defmodule Pleroma.Mixfile do
{:crypt,
git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
{:cors_plug, "~> 1.5"},
{:crypt,
git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
{:cors_plug, "~> 1.5"},
- {:ex_doc, "~> 0.2
0.2
", only: :dev, runtime: false},
+ {:ex_doc, "~> 0.2
1
", only: :dev, runtime: false},
{:web_push_encryption, "~> 0.2.1"},
{:swoosh, "~> 0.23.2"},
{:phoenix_swoosh, "~> 0.2"},
{:web_push_encryption, "~> 0.2.1"},
{:swoosh, "~> 0.23.2"},
{:phoenix_swoosh, "~> 0.2"},