summary refs log tree commit diff
path: root/syweb/webclient/img/default-profile.png
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-11-17 16:59:24 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-11-17 16:59:24 +0000
commit31a049eb692d37387a2db972da754f7ec56218c7 (patch)
tree9e5f47abad904d30c08d2f340b543a631e436894 /syweb/webclient/img/default-profile.png
parentInclude room membership in room initialSync (diff)
parentSYN-148: Add the alias after creating the room (diff)
downloadsynapse-31a049eb692d37387a2db972da754f7ec56218c7.tar.xz
Merge branch 'develop' into room-initial-sync
Conflicts:
	synapse/handlers/message.py
Diffstat (limited to 'syweb/webclient/img/default-profile.png')
-rw-r--r--syweb/webclient/img/default-profile.pngbin1722 -> 0 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/syweb/webclient/img/default-profile.png b/syweb/webclient/img/default-profile.png
deleted file mode 100644
index 6f81a3c417..0000000000
--- a/syweb/webclient/img/default-profile.png
+++ /dev/null
Binary files differ