Skip to content
Snippets Groups Projects
Commit a04860b5 authored by Timo Kösters's avatar Timo Kösters
Browse files

Merge branch 'as-fix' into 'master' 

fix: apply the same appservice sending rules to events coming from federation

See merge request famedly/conduit!31
parents 1a940b6e 437cb578
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 65 additions and 2 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment