diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:28:55 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:28:55 +0100 |
| commit | 357dd1871d5d7d9761321ddc7092abac9bfe3574 (patch) | |
| tree | 26a11bd98ec0167d4bf81d6117ad45f50a5e7246 /webclient/recents/recents-controller.js | |
| parent | Merge branch 'develop' into storage_transactions (diff) | |
| parent | Fix tests. (diff) | |
| download | synapse-357dd1871d5d7d9761321ddc7092abac9bfe3574.tar.xz | |
Merge branch 'develop' into storage_transactions
Conflicts: tests/handlers/test_federation.py tests/handlers/test_room.py
Diffstat (limited to 'webclient/recents/recents-controller.js')
0 files changed, 0 insertions, 0 deletions