summary refs log tree commit diff
path: root/webclient/img/red_phone.png
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-11-14 11:16:50 +0000
committerMark Haines <mark.haines@matrix.org>2014-11-14 11:16:50 +0000
commite903c941cb1bed18026f00ed1d3495a8d172f13a (patch)
tree894da7441d913361b70da4cc13cd73ead86d2e67 /webclient/img/red_phone.png
parentRemove unused 'context' variables to appease pyflakes (diff)
parentAdd notification-service unit tests. (diff)
downloadsynapse-e903c941cb1bed18026f00ed1d3495a8d172f13a.tar.xz
Merge branch 'develop' into request_logging
Conflicts:
	setup.py
	synapse/storage/_base.py
	synapse/util/async.py
Diffstat (limited to 'webclient/img/red_phone.png')
-rw-r--r--webclient/img/red_phone.pngbin378 -> 0 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/webclient/img/red_phone.png b/webclient/img/red_phone.png
deleted file mode 100644
index 11fc44940c..0000000000
--- a/webclient/img/red_phone.png
+++ /dev/null
Binary files differ