Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

diff --combined lib/mix/tasks/pleroma/user.ex
index b77e4291d9f50f8823f16709df605d43085ea001,a3f8bc9450a226fc523a8d42a02db4459869e69a..3f290cf4224969452804dcd98742b508761a1bf6
--- 1/lib/mix/tasks/pleroma/user.ex
--- 2/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@@ -31,8 -31,8 +31,8 @@@ defmodule Mix.Tasks.Pleroma.User d
        mix pleroma.user invite [OPTION...]
  
      Options:
-     - `--expires_at DATE` - last day on which token is active (e.g. "2019-04-05")
-     - `--max_use NUMBER` - maximum numbers of token uses
+     - `--expires-at DATE` - last day on which token is active (e.g. "2019-04-05")
+     - `--max-use NUMBER` - maximum numbers of token uses
  
    ## List generated invites
  
@@@ -413,35 -413,6 +413,35 @@@
      end
    end
  
 +  def run(["change_email", nickname, email]) do
 +    start_pleroma()
 +    with %User{} = user <- User.get_cached_by_nickname(nickname) do
 +       user
 +       |> User.update_changeset(%{"email" => email})
 +       |> User.update_and_set_cache()
 +       shell_info("#{nickname}'s email updated")
 +    end
 +  end
 +
 +  def run(["show", nickname]) do
 +    start_pleroma()
 +    nickname
 +    |> User.get_cached_by_nickname()
 +    |> IO.inspect
 +  end
 +
 +  def run(["send_confirmation", nickname]) do
 +    start_pleroma()
 +    with %User{} = user <- User.get_cached_by_nickname(nickname) do
 +       user
 +       |> Pleroma.Emails.UserEmail.account_confirmation_email()
 +       |> IO.inspect
 +       |> Pleroma.Emails.Mailer.deliver!()
 +       shell_info("#{nickname}'s email sent")
 +    end
 +  end
 +  
 +
    def run(["toggle_confirmed", nickname]) do
      start_pleroma()
  

diff --combined priv/static/emoji/sheet_10.png
index 3ee92a1f10a132005285825cc0168f5c48032a07,3ee92a1f10a132005285825cc0168f5c48032a07..0000000000000000000000000000000000000000
deleted file mode 100644,100644
Binary files differ