Fix conflict

diff --cc CHANGELOG.md
index fef10463aeee59f83ef57dfb520b5094ee99caba,2fa9bd1e7a14aca8f1439bbccccbc9909039a7cf..da7623cae844f96e8574c32dd6679b8adbe030e1
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -5,7 -5,7 +5,8 @@@ The format is based on [Keep a Changelo
  
  ## [unreleased]
  ### Added
 +- Digest email for inactive users
+ - Add a generic settings store for frontends / clients to use.
  - Optional SSH access mode. (Needs `erlang-ssh` package on some distributions).
  - [MongooseIM](https://github.com/esl/MongooseIM) http authentication support.
  - LDAP authentication

diff --cc config/config.exs
Simple merge

diff --cc docs/config.md
index fa3547f2a0d2480e5ef23642b7f8ede43a5c0631,f4a1868fd8970bef3d779b2d0b7a99365269f7fb..c1d20e0cc998d543bbe597e7b155304c8dbc01cb
--- 1/docs/config.md
--- 2/docs/config.md
+++ b/docs/config.md
@@@ -497,20 -514,8 +514,20 @@@ Authentication / authorization settings
  
  * `auth_template`: authentication form template. By default it's `show.html` which corresponds to `lib/pleroma/web/templates/o_auth/o_auth/show.html.eex`.
  * `oauth_consumer_template`: OAuth consumer mode authentication form template. By default it's `consumer.html` which corresponds to `lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex`.
- * `oauth_consumer_strategies`: the list of enabled OAuth consumer strategies; by default it's set by OAUTH_CONSUMER_STRATEGIES environment variable.
+ * `oauth_consumer_strategies`: the list of enabled OAuth consumer strategies; by default it's set by OAUTH_CONSUMER_STRATEGIES environment variable. Each entry in this space-delimited string should be of format `<strategy>` or `<strategy>:<dependency>` (e.g. `twitter` or `keycloak:ueberauth_keycloak_strategy` in case dependency is named differently than `ueberauth_<strategy>`).
  
 +## :email_notifications
 +
 +Email notifications settings.
 +
 +  - digest - emails of "what you've missed" for users who have been
 +    inactive for a while.
 +    - active: globally enable or disable digest emails
 +    - schedule: When to send digest email, in [crontab format](https://en.wikipedia.org/wiki/Cron).
 +      "0 0 * * 0" is the default, meaning "once a week at midnight on Sunday morning"
 +    - interval: Minimum interval between digest emails to one user
 +    - inactivity_threshold: Minimum user inactivity threshold
 +
  ## OAuth consumer mode
  
  OAuth consumer mode allows sign in / sign up via external OAuth providers (e.g. Twitter, Facebook, Google, Microsoft, etc.).

diff --cc lib/pleroma/user/info.ex
index 36bae61a4cebce53f6b3396acba5d2b643d8a8f0,08e43ff0fb9129e90cf1eceb7a6616207e3a5d1b..afdbe60336fcbee17f50b7b51e90e138f95cd659
--- 1/lib/pleroma/user/info.ex
--- 2/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@@ -42,10 -42,9 +42,11 @@@ defmodule Pleroma.User.Info d
      field(:hide_follows, :boolean, default: false)
      field(:hide_favorites, :boolean, default: true)
      field(:pinned_activities, {:array, :string}, default: [])
 +    field(:flavour, :string, default: nil)
 +    field(:email_notifications, :map, default: %{"digest" => false})
      field(:mascot, :map, default: nil)
      field(:emoji, {:array, :map}, default: [])
+     field(:pleroma_settings_store, :map, default: %{})
  
      field(:notification_settings, :map,
        default: %{

diff --cc mix.exs
Simple merge