summary refs log tree commit diff
path: root/synapse/http/additional_resource.py (unfollow)
Commit message (Expand)AuthorFilesLines
2019-02-13Merge pull request #4218 from matrix-org/travis/account-mergingTravis Ralston2-2/+72
2019-02-13Disable presence/typing/receipts. Don't die if we can't parse an EDUErik Johnston4-1/+16
2019-02-13Make using proxy optionalErik Johnston1-5/+25