diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:20:50 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:20:50 +0100 |
| commit | 66a4d3352447f170afcddd1270c1a743273d19e6 (patch) | |
| tree | 49ee0260dd816d6f7c640f742c4895c6b5cb10fb /webclient | |
| parent | Merge branch 'develop' into storage_transactions (diff) | |
| parent | Merge branch 'client_server_url_rename' into develop (diff) | |
| download | synapse-66a4d3352447f170afcddd1270c1a743273d19e6.tar.xz | |
Merge branch 'develop' into storage_transactions
Diffstat (limited to 'webclient')
| -rw-r--r-- | webclient/components/matrix/matrix-service.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js |
