Merge develop

diff --cc lib/mix/tasks/pleroma/sample_config.eex
index df9d1ad65a517dd78ef768488e280adc42545217,47b6be729f16c4a99789bba85d7cd36c80edf30f..0cd572797567a28e918c590c78b1fbceade68ca3
--- 1/lib/mix/tasks/pleroma/sample_config.eex
--- 2/lib/mix/tasks/sample_config.eex
+++ b/lib/mix/tasks/pleroma/sample_config.eex
@@@ -21,14 -16,21 +21,20 @@@ config :pleroma, :media_proxy
    redirect_on_failure: true
    #base_url: "https://cache.pleroma.social"
  
 -# Configure your database
  config :pleroma, Pleroma.Repo,
    adapter: Ecto.Adapters.Postgres,
 -  username: "pleroma",
 +  username: "<%= dbuser %>",
    password: "<%= dbpass %>",
 -  database: "pleroma_dev",
 -  hostname: "localhost",
 +  database: "<%= dbname %>",
 +  hostname: "<%= dbhost %>",
    pool_size: 10
  
+ # Configure web push notifications
+ config :web_push_encryption, :vapid_details,
+   subject: "mailto:<%= email %>",
+   public_key: "<%= web_push_public_key %>",
+   private_key: "<%= web_push_private_key %>"
+ 
  # Enable Strict-Transport-Security once SSL is working:
  # config :pleroma, :http_security,
  #   sts: true