diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-12 18:19:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-12 18:19:32 +0100 |
| commit | e3aec9bc818e203a4883f8863acb96b9c273112a (patch) | |
| tree | 762f87365f917f510f00bc6aee7a4068cdd56e76 /webclient/media | |
| parent | fix embarassing bug where in-progress messages get vaped when the previous on... (diff) | |
| parent | Bump version and change log (diff) | |
| download | synapse-e3aec9bc818e203a4883f8863acb96b9c273112a.tar.xz | |
Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse
Conflicts: webclient/room/room-controller.js
Diffstat (limited to 'webclient/media')
| -rw-r--r-- | webclient/media/busy.mp3 | bin | 0 -> 24834 bytes |
| -rw-r--r-- | webclient/media/busy.ogg | bin | 0 -> 13960 bytes |
| -rw-r--r-- | webclient/media/callend.mp3 | bin | 0 -> 12971 bytes |
| -rw-r--r-- | webclient/media/callend.ogg | bin | 0 -> 13932 bytes |
| -rw-r--r-- | webclient/media/ring.mp3 | bin | 0 -> 19662 bytes |
| -rw-r--r-- | webclient/media/ring.ogg | bin | 0 -> 20636 bytes |
| -rw-r--r-- | webclient/media/ringback.mp3 | bin | 0 -> 18398 bytes |
| -rw-r--r-- | webclient/media/ringback.ogg | bin | 0 -> 8352 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/webclient/media/busy.mp3 b/webclient/media/busy.mp3 new file mode 100644 index 0000000000..fec27ba4c5 --- /dev/null +++ b/webclient/media/busy.mp3 Binary files differdiff --git a/webclient/media/busy.ogg b/webclient/media/busy.ogg new file mode 100644 index 0000000000..5d64a7d0d9 --- /dev/null +++ b/webclient/media/busy.ogg Binary files differdiff --git a/webclient/media/callend.mp3 b/webclient/media/callend.mp3 new file mode 100644 index 0000000000..50c34e5640 --- /dev/null +++ b/webclient/media/callend.mp3 Binary files differdiff --git a/webclient/media/callend.ogg b/webclient/media/callend.ogg new file mode 100644 index 0000000000..927ce1f634 --- /dev/null +++ b/webclient/media/callend.ogg Binary files differdiff --git a/webclient/media/ring.mp3 b/webclient/media/ring.mp3 new file mode 100644 index 0000000000..3c3cdde3f9 --- /dev/null +++ b/webclient/media/ring.mp3 Binary files differdiff --git a/webclient/media/ring.ogg b/webclient/media/ring.ogg new file mode 100644 index 0000000000..de49b8ae6f --- /dev/null +++ b/webclient/media/ring.ogg Binary files differdiff --git a/webclient/media/ringback.mp3 b/webclient/media/ringback.mp3 new file mode 100644 index 0000000000..6ee34bf395 --- /dev/null +++ b/webclient/media/ringback.mp3 Binary files differdiff --git a/webclient/media/ringback.ogg b/webclient/media/ringback.ogg new file mode 100644 index 0000000000..7dbfdcd017 --- /dev/null +++ b/webclient/media/ringback.ogg Binary files differ |