diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 16:31:09 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 16:31:09 +0100 |
commit | 46dcb0d8902c531e3b187453435913fc6e2344a9 (patch) | |
tree | 1bfb42952b976731888fb06a49e253d1037fa827 /webclient/recents/recents-controller.js | |
parent | Listen using SSL (diff) | |
parent | missing semicolon (diff) | |
download | synapse-46dcb0d8902c531e3b187453435913fc6e2344a9.tar.xz |
Merge branch 'develop' into server2server_tls
Diffstat (limited to 'webclient/recents/recents-controller.js')
-rw-r--r-- | webclient/recents/recents-controller.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js |