diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-11-14 11:16:50 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-11-14 11:16:50 +0000 |
| commit | e903c941cb1bed18026f00ed1d3495a8d172f13a (patch) | |
| tree | 894da7441d913361b70da4cc13cd73ead86d2e67 /syweb/webclient/media | |
| parent | Remove unused 'context' variables to appease pyflakes (diff) | |
| parent | Add notification-service unit tests. (diff) | |
| download | synapse-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')
| -rw-r--r-- | syweb/webclient/media/busy.mp3 | bin | 0 -> 24834 bytes |
| -rw-r--r-- | syweb/webclient/media/busy.ogg | bin | 0 -> 13960 bytes |
| -rw-r--r-- | syweb/webclient/media/callend.mp3 | bin | 0 -> 12971 bytes |
| -rw-r--r-- | syweb/webclient/media/callend.ogg | bin | 0 -> 13932 bytes |
| -rw-r--r-- | syweb/webclient/media/ring.mp3 | bin | 0 -> 19662 bytes |
| -rw-r--r-- | syweb/webclient/media/ring.ogg | bin | 0 -> 20636 bytes |
| -rw-r--r-- | syweb/webclient/media/ringback.mp3 | bin | 0 -> 18398 bytes |
| -rw-r--r-- | syweb/webclient/media/ringback.ogg | bin | 0 -> 8352 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/syweb/webclient/media/busy.mp3 b/syweb/webclient/media/busy.mp3 new file mode 100644 index 0000000000..fec27ba4c5 --- /dev/null +++ b/syweb/webclient/media/busy.mp3 Binary files differdiff --git a/syweb/webclient/media/busy.ogg b/syweb/webclient/media/busy.ogg new file mode 100644 index 0000000000..5d64a7d0d9 --- /dev/null +++ b/syweb/webclient/media/busy.ogg Binary files differdiff --git a/syweb/webclient/media/callend.mp3 b/syweb/webclient/media/callend.mp3 new file mode 100644 index 0000000000..50c34e5640 --- /dev/null +++ b/syweb/webclient/media/callend.mp3 Binary files differdiff --git a/syweb/webclient/media/callend.ogg b/syweb/webclient/media/callend.ogg new file mode 100644 index 0000000000..927ce1f634 --- /dev/null +++ b/syweb/webclient/media/callend.ogg Binary files differdiff --git a/syweb/webclient/media/ring.mp3 b/syweb/webclient/media/ring.mp3 new file mode 100644 index 0000000000..3c3cdde3f9 --- /dev/null +++ b/syweb/webclient/media/ring.mp3 Binary files differdiff --git a/syweb/webclient/media/ring.ogg b/syweb/webclient/media/ring.ogg new file mode 100644 index 0000000000..de49b8ae6f --- /dev/null +++ b/syweb/webclient/media/ring.ogg Binary files differdiff --git a/syweb/webclient/media/ringback.mp3 b/syweb/webclient/media/ringback.mp3 new file mode 100644 index 0000000000..6ee34bf395 --- /dev/null +++ b/syweb/webclient/media/ringback.mp3 Binary files differdiff --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 |