Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/user.ex
index 5582168941c110bf65b1cb2491633d1d74b5c251,41289b4d0591cb6cad4b07d768075726ba95d4b2..1e44412d056821623c34fa8de842fe095f9a0dbe
--- 1/lib/pleroma/user.ex
--- 2/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@@ -51,11 -50,11 +51,12 @@@ defmodule Pleroma.User d
      field(:local, :boolean, default: true)
      field(:follower_address, :string)
      field(:search_rank, :float, virtual: true)
+     field(:search_type, :integer, virtual: true)
      field(:tags, {:array, :string}, default: [])
      field(:bookmarks, {:array, :string}, default: [])
-     field(:last_refreshed_at, :naive_datetime)
+     field(:last_refreshed_at, :naive_datetime_usec)
      has_many(:notifications, Notification)
 +    has_many(:registrations, Registration)
      embeds_one(:info, Pleroma.User.Info)
  
      timestamps()

diff --cc mix.exs
Simple merge

diff --cc mix.lock
Simple merge