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

Merge branch 'feature/pinned-posts' into 'develop'

Browse source 
Pinned Statuses

Closes #440

See merge request pleroma/pleroma!636
This commit is contained in:
kaniini 2019-01-10 02:39:53 +00:00
commit 7f5efddd6e
19 changed files with 370 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/config.exs
View file

@ -138,7 +138,8 @@ config :pleroma, :instance,
],
finmoji_enabled: true,
mrf_transparency: true,
autofollowed_nicknames: []
autofollowed_nicknames: [],
max_pinned_statuses: 1
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because