summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-08-29 11:33:36 +0100
committerDavid Baker <dbkr@matrix.org>2014-08-29 11:33:36 +0100
commit171d8b032f9494fcfe720ec66ebb807bfb3b1de5 (patch)
tree4826e8cf9fef892e78f9418e8c0bae0149a8b9fd /docs
parentCleaned up ng deps. By convention, angular modules must be listed at first (diff)
parentMore basic functionality for voip calls (like hanging up) (diff)
downloadsynapse-171d8b032f9494fcfe720ec66ebb807bfb3b1de5.tar.xz
Merge branch 'voip' into develop
Conflicts:
	webclient/room/room-controller.js
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions