Remove editor junk
SYN-187: Set a more sensible default for the content_addr
Merge branch 'master' into develop
Bump version
Merge branch 'master' of github.com:matrix-org/synapse into develop
a simple matrix->verto bot, distantly related to the irc bridge
clean up a vertobot a bit
ignore rogue matrix call events; support verto.media RPC as a horrible hack; fix NA::Matrix dep
fix IO::Async abuse - thanks leo
re-add OSX troubleshooting instructions (not sure how they got lost)
Add non-working jitsi meet bridge
Remove editor junk
Allow GET /room/:room_id/messages without 'limit' parameter to default to 10
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Squash room_ids list to a set() to remove duplicates - with TODO marker as I have no idea /why/ the dups are happening in the first place
Extra verbosity on logging of received presence info
Workaround for non-uniqueness of room member events in the database confusing HAVING COUNT() test of room membership intersection (with thanks to Tom Molesworth)
Don't log synapse.storage at DEBUG level when under -v; require -v -v for that
Fix bug where did not always resolve all the deferreds in _attempt_new_transaction
Bump changes and version