summary refs log tree commit diff
path: root/syweb/webclient/media/ringback.ogg
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-11-14 11:16:50 +0000
committerMark Haines <mark.haines@matrix.org>2014-11-14 11:16:50 +0000
commite903c941cb1bed18026f00ed1d3495a8d172f13a (patch)
tree894da7441d913361b70da4cc13cd73ead86d2e67 /syweb/webclient/media/ringback.ogg
parentRemove unused 'context' variables to appease pyflakes (diff)
parentAdd notification-service unit tests. (diff)
downloadsynapse-e903c941cb1bed18026f00ed1d3495a8d172f13a.tar.xz
Merge branch 'develop' into request_logging
Conflicts:
	setup.py
	synapse/storage/_base.py
	synapse/util/async.py
Diffstat (limited to 'syweb/webclient/media/ringback.ogg')
-rw-r--r--syweb/webclient/media/ringback.oggbin0 -> 8352 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/syweb/webclient/media/ringback.ogg b/syweb/webclient/media/ringback.ogg
new file mode 100644
index 0000000000..7dbfdcd017
--- /dev/null
+++ b/syweb/webclient/media/ringback.ogg
Binary files differ