diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-15 18:52:27 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-15 18:52:27 +0300 |
| commit | efbc2edba17a7ee2d3e15bca5fa4f6cf8b4b5116 (patch) | |
| tree | 086f3bb1ae6ca2fbb9909e69297a7dabea9061fb /mix.exs | |
| parent | e6f43a831bdd2a381ed4de493344886f312f9a38 (diff) | |
| parent | 9c64a25713790fefa8b5c419aeadf55113c17073 (diff) | |
| download | pleroma-efbc2edba17a7ee2d3e15bca5fa4f6cf8b4b5116.tar.gz pleroma-efbc2edba17a7ee2d3e15bca5fa4f6cf8b4b5116.zip | |
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
# lib/pleroma/web/router.ex
Diffstat (limited to 'mix.exs')
| -rw-r--r-- | mix.exs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -125,7 +125,7 @@ defmodule Pleroma.Mixfile do {:crypt, git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"}, {:cors_plug, "~> 1.5"}, - {:ex_doc, "~> 0.20.2", only: :dev, runtime: false}, + {:ex_doc, "~> 0.21", only: :dev, runtime: false}, {:web_push_encryption, "~> 0.2.1"}, {:swoosh, "~> 0.23.2"}, {:phoenix_swoosh, "~> 0.2"}, |