Merge develop

2019-04-30 20:17:52 +07:00 · 2019-04-30 20:17:52 +07:00 · 0f0cc2703b
commit 0f0cc2703b
parent b87ad13803 32a4501d2d
243 changed files with 2194 additions and 750 deletions
--- a/mix.exs
+++ b/mix.exs
@ -84,6 +84,7 @@ defmodule Pleroma.Mixfile do
      {:ex_aws, "~> 2.0"},
      {:ex_aws_s3, "~> 2.0"},
      {:earmark, "~> 1.3"},
+      {:bbcode, "~> 0.1"},
      {:ex_machina, "~> 2.3", only: :test},
      {:credo, "~> 0.9.3", only: [:dev, :test]},
      {:mock, "~> 0.3.1", only: :test},