diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-12-29 14:01:07 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-12-29 14:01:07 +0000 |
commit | 90d60e3fe4f6738c98fde19a3477e0de406e06bf (patch) | |
tree | 0a137bf177f733a1c5f016b59619f529518a7271 /synapse/server.py | |
parent | improve error msg (diff) | |
parent | Return the argument passed to the callback in a deferred callback, otherwise ... (diff) | |
download | synapse-90d60e3fe4f6738c98fde19a3477e0de406e06bf.tar.xz |
Merge branch 'hotfixes-v0.6.0a' v0.6.0b
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions