diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-17 16:59:24 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-17 16:59:24 +0000 |
| commit | 31a049eb692d37387a2db972da754f7ec56218c7 (patch) | |
| tree | 9e5f47abad904d30c08d2f340b543a631e436894 /syweb/webclient/media | |
| parent | Include room membership in room initialSync (diff) | |
| parent | SYN-148: Add the alias after creating the room (diff) | |
| download | synapse-31a049eb692d37387a2db972da754f7ec56218c7.tar.xz | |
Merge branch 'develop' into room-initial-sync
Conflicts: synapse/handlers/message.py
Diffstat (limited to 'syweb/webclient/media')
| -rw-r--r-- | syweb/webclient/media/busy.mp3 | bin | 24834 -> 0 bytes |
| -rw-r--r-- | syweb/webclient/media/busy.ogg | bin | 13960 -> 0 bytes |
| -rw-r--r-- | syweb/webclient/media/callend.mp3 | bin | 12971 -> 0 bytes |
| -rw-r--r-- | syweb/webclient/media/callend.ogg | bin | 13932 -> 0 bytes |
| -rw-r--r-- | syweb/webclient/media/ring.mp3 | bin | 19662 -> 0 bytes |
| -rw-r--r-- | syweb/webclient/media/ring.ogg | bin | 20636 -> 0 bytes |
| -rw-r--r-- | syweb/webclient/media/ringback.mp3 | bin | 18398 -> 0 bytes |
| -rw-r--r-- | syweb/webclient/media/ringback.ogg | bin | 8352 -> 0 bytes |
8 files changed, 0 insertions, 0 deletions
diff --git a/syweb/webclient/media/busy.mp3 b/syweb/webclient/media/busy.mp3 deleted file mode 100644 index fec27ba4c5..0000000000 --- a/syweb/webclient/media/busy.mp3 +++ /dev/null Binary files differdiff --git a/syweb/webclient/media/busy.ogg b/syweb/webclient/media/busy.ogg deleted file mode 100644 index 5d64a7d0d9..0000000000 --- a/syweb/webclient/media/busy.ogg +++ /dev/null Binary files differdiff --git a/syweb/webclient/media/callend.mp3 b/syweb/webclient/media/callend.mp3 deleted file mode 100644 index 50c34e5640..0000000000 --- a/syweb/webclient/media/callend.mp3 +++ /dev/null Binary files differdiff --git a/syweb/webclient/media/callend.ogg b/syweb/webclient/media/callend.ogg deleted file mode 100644 index 927ce1f634..0000000000 --- a/syweb/webclient/media/callend.ogg +++ /dev/null Binary files differdiff --git a/syweb/webclient/media/ring.mp3 b/syweb/webclient/media/ring.mp3 deleted file mode 100644 index 3c3cdde3f9..0000000000 --- a/syweb/webclient/media/ring.mp3 +++ /dev/null Binary files differdiff --git a/syweb/webclient/media/ring.ogg b/syweb/webclient/media/ring.ogg deleted file mode 100644 index de49b8ae6f..0000000000 --- a/syweb/webclient/media/ring.ogg +++ /dev/null Binary files differdiff --git a/syweb/webclient/media/ringback.mp3 b/syweb/webclient/media/ringback.mp3 deleted file mode 100644 index 6ee34bf395..0000000000 --- a/syweb/webclient/media/ringback.mp3 +++ /dev/null Binary files differdiff --git a/syweb/webclient/media/ringback.ogg b/syweb/webclient/media/ringback.ogg deleted file mode 100644 index 7dbfdcd017..0000000000 --- a/syweb/webclient/media/ringback.ogg +++ /dev/null Binary files differ |