hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Ivan Tashkinov 2020-12-26 22:23:05 +03:00
commit 4134abef63
205 changed files with 682 additions and 443 deletions
Download patch file Download diff file Expand all files Collapse all files

3
priv/templates/sample_config.eex
View file

@ -32,8 +32,7 @@ config :pleroma, Pleroma.Repo,
username: "<%= dbuser %>",
password: "<%= dbpass %>",
database: "<%= dbname %>",
hostname: "<%= dbhost %>",
pool_size: 10
hostname: "<%= dbhost %>"
# Configure web push notifications
config :web_push_encryption, :vapid_details,