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 /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 'webclient/media')
| -rw-r--r-- | webclient/media/busy.mp3 | bin | 24834 -> 0 bytes |
| -rw-r--r-- | webclient/media/busy.ogg | bin | 13960 -> 0 bytes |
| -rw-r--r-- | webclient/media/callend.mp3 | bin | 12971 -> 0 bytes |
| -rw-r--r-- | webclient/media/callend.ogg | bin | 13932 -> 0 bytes |
| -rw-r--r-- | webclient/media/ring.mp3 | bin | 19662 -> 0 bytes |
| -rw-r--r-- | webclient/media/ring.ogg | bin | 20636 -> 0 bytes |
| -rw-r--r-- | webclient/media/ringback.mp3 | bin | 18398 -> 0 bytes |
| -rw-r--r-- | webclient/media/ringback.ogg | bin | 8352 -> 0 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/webclient/media/busy.mp3 b/webclient/media/busy.mp3 deleted file mode 100644 index fec27ba4c5..0000000000 --- a/webclient/media/busy.mp3 +++ /dev/null Binary files differdiff --git a/webclient/media/busy.ogg b/webclient/media/busy.ogg deleted file mode 100644 index 5d64a7d0d9..0000000000 --- a/webclient/media/busy.ogg +++ /dev/null Binary files differdiff --git a/webclient/media/callend.mp3 b/webclient/media/callend.mp3 deleted file mode 100644 index 50c34e5640..0000000000 --- a/webclient/media/callend.mp3 +++ /dev/null Binary files differdiff --git a/webclient/media/callend.ogg b/webclient/media/callend.ogg deleted file mode 100644 index 927ce1f634..0000000000 --- a/webclient/media/callend.ogg +++ /dev/null Binary files differdiff --git a/webclient/media/ring.mp3 b/webclient/media/ring.mp3 deleted file mode 100644 index 3c3cdde3f9..0000000000 --- a/webclient/media/ring.mp3 +++ /dev/null Binary files differdiff --git a/webclient/media/ring.ogg b/webclient/media/ring.ogg deleted file mode 100644 index de49b8ae6f..0000000000 --- a/webclient/media/ring.ogg +++ /dev/null Binary files differdiff --git a/webclient/media/ringback.mp3 b/webclient/media/ringback.mp3 deleted file mode 100644 index 6ee34bf395..0000000000 --- a/webclient/media/ringback.mp3 +++ /dev/null Binary files differdiff --git a/webclient/media/ringback.ogg b/webclient/media/ringback.ogg deleted file mode 100644 index 7dbfdcd017..0000000000 --- a/webclient/media/ringback.ogg +++ /dev/null Binary files differ |