diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-07-18 23:38:38 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-07-18 23:38:38 +0300 |
| commit | 9570a5be405c4cf4f07907eab4ced21e07fa20c9 (patch) | |
| tree | 9575741206d0604e74ab2d8f719c3da0a3002b1d /mix.exs | |
| parent | 418ae6638d64c915ce4dae742dd493f43c8025d8 (diff) | |
| parent | 16cfee708ec8e9c6cbbeb15432127c7757c5c173 (diff) | |
| download | pleroma-9570a5be405c4cf4f07907eab4ced21e07fa20c9.tar.gz pleroma-9570a5be405c4cf4f07907eab4ced21e07fa20c9.zip | |
Merge branch 'develop' into feature/admin-api-user-statuses
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -14,7 +14,7 @@ defmodule Pleroma.Mixfile do aliases: aliases(), deps: deps(), test_coverage: [tool: ExCoveralls], - + preferred_cli_env: ["coveralls.html": :test], # Docs name: "Pleroma", homepage_url: "https://pleroma.social/", @@ -95,6 +95,7 @@ defmodule Pleroma.Mixfile do defp deps do [ {:phoenix, "~> 1.4.8"}, + {:tzdata, "~> 1.0"}, {:plug_cowboy, "~> 2.0"}, {:phoenix_pubsub, "~> 1.1"}, {:phoenix_ecto, "~> 4.0"}, @@ -137,7 +138,7 @@ defmodule Pleroma.Mixfile do ref: "95e8188490e97505c56636c1379ffdf036c1fdde"}, {:http_signatures, git: "https://git.pleroma.social/pleroma/http_signatures.git", - ref: "9789401987096ead65646b52b5a2ca6bf52fc531"}, + ref: "a2a5982fa167fb1352fbd518ce6b606ba233a989"}, {:pleroma_job_queue, "~> 0.2.0"}, {:telemetry, "~> 0.3"}, {:prometheus_ex, "~> 3.0"}, |