projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 56b5b9a cbf8bfc)
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into...
authorlain <lain@soykaf.club>
Mon, 3 Aug 2020 21:01:56 +0000 (21:01 +0000)
committerlain <lain@soykaf.club>
Mon, 3 Aug 2020 21:01:56 +0000 (21:01 +0000)
fixes 1957 Add option to send user chatmessage instead of dm

Closes #1957

See merge request pleroma/pleroma!2782

1  2 
config/config.exs patch | diff1 | diff2 | blob | history
config/description.exs patch | diff1 | diff2 | blob | history
docs/configuration/cheatsheet.md patch | diff1 | diff2 | blob | history

diff --cc config/config.exs
Simple merge
diff --cc config/description.exs
Simple merge
diff --cc docs/configuration/cheatsheet.md
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git