diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 16:54:12 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 16:54:12 +0100 |
| commit | 1d95e78759cc1307d15d6cc6388f52063e833355 (patch) | |
| tree | 0307617989016019bfd1d41a15b22499d02091ef /webclient/app-controller.js | |
| parent | add _get_room_member, fix datastore methods (diff) | |
| parent | Added RestServlet for /rooms/$roomid/initialSync (diff) | |
| download | synapse-1d95e78759cc1307d15d6cc6388f52063e833355.tar.xz | |
Merge branch 'develop' into storage_transactions
Diffstat (limited to '')
| -rw-r--r-- | webclient/app-controller.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/webclient/app-controller.js b/webclient/app-controller.js |
