projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b548181 bf27190)
Merge branch 'safe-mentions' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 22 Mar 2019 00:50:24 +0000 (00:50 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 22 Mar 2019 00:50:24 +0000 (00:50 +0000)
Add safe dm mode option.

See merge request pleroma/pleroma!958

1  2 
config/config.exs patch | diff1 | diff2 | blob | history
docs/config.md patch | diff1 | diff2 | blob | history
lib/pleroma/web/common_api/utils.ex patch | diff1 | diff2 | blob | history

diff --cc config/config.exs
Simple merge
diff --cc docs/config.md
Simple merge
diff --cc lib/pleroma/web/common_api/utils.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git