diff options
author | Kegan Dougal <kegan@matrix.org> | 2014-08-26 16:19:44 +0100 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2014-08-26 16:19:44 +0100 |
commit | d0103400b556138fca36160fd0273c0141ca94c4 (patch) | |
tree | 0a66e58777d171743b72cf0e93240f747c6a5825 /webclient/components | |
parent | Use state_key rather than target_user_id (diff) | |
parent | Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> /rooms/$ro... (diff) | |
download | synapse-d0103400b556138fca36160fd0273c0141ca94c4.tar.xz |
Merge branch 'client_server_url_rename' into develop
Diffstat (limited to 'webclient/components')
-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 |