summary refs log tree commit diff
path: root/webclient/media
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-19 18:03:57 +0000
committerErik Johnston <erik@matrix.org>2014-11-19 18:03:57 +0000
commit19977b465913c3cb263d88884e16f9dc13f2a05e (patch)
tree6015e4155502d34fd8aa35fc32094d8c29981a0a /webclient/media
parentMerge branch 'release-v0.4.2' of github.com:matrix-org/synapse (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into release-v0.5.0 (diff)
downloadsynapse-19977b465913c3cb263d88884e16f9dc13f2a05e.tar.xz
Merge branch 'release-v0.5.0' of github.com:matrix-org/synapse v0.5.0
Diffstat (limited to 'webclient/media')
-rw-r--r--webclient/media/busy.mp3bin24834 -> 0 bytes
-rw-r--r--webclient/media/busy.oggbin13960 -> 0 bytes
-rw-r--r--webclient/media/callend.mp3bin12971 -> 0 bytes
-rw-r--r--webclient/media/callend.oggbin13932 -> 0 bytes
-rw-r--r--webclient/media/ring.mp3bin19662 -> 0 bytes
-rw-r--r--webclient/media/ring.oggbin20636 -> 0 bytes
-rw-r--r--webclient/media/ringback.mp3bin18398 -> 0 bytes
-rw-r--r--webclient/media/ringback.oggbin8352 -> 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