Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...

# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/config.ex

diff --cc CHANGELOG.md
index a7b5f6ac055257bd57524952e5084e340687d65e,74473b3d080b32b887983e0c7ff41ab701c18e1a..974925e4fa060a7205fb116c99232803a3ca7316
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -31,9 -36,9 +36,10 @@@ The format is based on [Keep a Changelo
  - **Breaking:** AdminAPI `GET /api/pleroma/admin/users/:nickname_or_id/statuses` changed response format and added the number of total users posts.
  - **Breaking:** AdminAPI `GET /api/pleroma/admin/instances/:instance/statuses` changed response format and added the number of total users posts.
  - Admin API: Reports now ordered by newest
+ - Pleroma API: `GET /api/v1/pleroma/chats` is deprecated in favor of `GET /api/v2/pleroma/chats`.
  
  </details>
 +- Improved hashtag timeline performance (requires a background migration). 
  
  ### Added
  

diff --cc config/config.exs
Simple merge

diff --cc lib/pleroma/application.ex
index 9ca048a5f25cd8195ce6dac4c3358cb9ac4dbbeb,c853a2bb4564409c22bae36d5fdc1a622913a35a..2ff7562e24d5f89e28e1a8a58be1a04139da928f
--- 1/lib/pleroma/application.ex
--- 2/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@@ -103,9 -104,7 +104,8 @@@ defmodule Pleroma.Application d
          dont_run_in_test(@mix_env) ++
          chat_child(chat_enabled?()) ++
          [
-           Pleroma.Web.Endpoint,
-           Pleroma.Gopher.Server,
-           Pleroma.Migrators.HashtagsTableMigrator
++          Pleroma.Migrators.HashtagsTableMigrator,
+           Pleroma.Gopher.Server
          ]
  
      # See http://elixir-lang.org/docs/stable/elixir/Supervisor.html

diff --cc lib/pleroma/config.ex
index e057d8c020203b4d7db65515c162c4953ab62f5c,2e15a37193ada875eeb73746d30b2bc37e464a68..54e332595d73762f155ce5c438ea8bfd494184c0
--- 1/lib/pleroma/config.ex
--- 2/lib/pleroma/config.ex
+++ b/lib/pleroma/config.ex
@@@ -99,20 -99,4 +99,8 @@@ defmodule Pleroma.Config d
    def oauth_consumer_strategies, do: get([:auth, :oauth_consumer_strategies], [])
  
    def oauth_consumer_enabled?, do: oauth_consumer_strategies() != []
-   def enforce_oauth_admin_scope_usage?, do: !!get([:auth, :enforce_oauth_admin_scope_usage])
- 
-   def oauth_admin_scopes(scopes) when is_list(scopes) do
-     Enum.flat_map(
-       scopes,
-       fn scope ->
-         ["admin:#{scope}"] ++
-           if enforce_oauth_admin_scope_usage?(), do: [], else: [scope]
-       end
-     )
-   end
- 
 +
 +  def feature_enabled?(feature_name) do
 +    get([:features, feature_name]) not in [nil, false, :disabled, :auto]
 +  end
  end