diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-22 13:02:47 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-22 13:02:47 +0100 |
| commit | e68dc04900e49d6a86dfcc41c0be33ede02366c8 (patch) | |
| tree | 63998d3db3dc7e676e119f7557a1dbd227900a52 /webclient/settings | |
| parent | Propagate failure reason to the other party. (diff) | |
| parent | Fix undefined variable error (diff) | |
| download | synapse-e68dc04900e49d6a86dfcc41c0be33ede02366c8.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'webclient/settings')
0 files changed, 0 insertions, 0 deletions