diff options
| author | David Baker <dbkr@matrix.org> | 2014-08-29 11:33:36 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-08-29 11:33:36 +0100 |
| commit | 171d8b032f9494fcfe720ec66ebb807bfb3b1de5 (patch) | |
| tree | 4826e8cf9fef892e78f9418e8c0bae0149a8b9fd /setup.py | |
| parent | Cleaned up ng deps. By convention, angular modules must be listed at first (diff) | |
| parent | More basic functionality for voip calls (like hanging up) (diff) | |
| download | synapse-171d8b032f9494fcfe720ec66ebb807bfb3b1de5.tar.xz | |
Merge branch 'voip' into develop
Conflicts: webclient/room/room-controller.js
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions