summary refs log tree commit diff
path: root/syweb/webclient/img
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 /syweb/webclient/img
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 'syweb/webclient/img')
-rw-r--r--syweb/webclient/img/attach.pngbin0 -> 473 bytes
-rw-r--r--syweb/webclient/img/close.pngbin0 -> 397 bytes
-rw-r--r--syweb/webclient/img/default-profile.pngbin0 -> 1722 bytes
-rw-r--r--syweb/webclient/img/gradient.pngbin0 -> 194 bytes
-rw-r--r--syweb/webclient/img/green_phone.pngbin0 -> 434 bytes
-rw-r--r--syweb/webclient/img/logo-small.pngbin0 -> 910 bytes
-rw-r--r--syweb/webclient/img/logo.pngbin0 -> 4060 bytes
-rw-r--r--syweb/webclient/img/settings.pngbin0 -> 864 bytes
-rw-r--r--syweb/webclient/img/video.pngbin0 -> 604 bytes
-rw-r--r--syweb/webclient/img/voice.pngbin0 -> 659 bytes
10 files changed, 0 insertions, 0 deletions
diff --git a/syweb/webclient/img/attach.png b/syweb/webclient/img/attach.png
new file mode 100644
index 0000000000..d95eabaf00
--- /dev/null
+++ b/syweb/webclient/img/attach.png
Binary files differdiff --git a/syweb/webclient/img/close.png b/syweb/webclient/img/close.png
new file mode 100644
index 0000000000..fbcdb51e6b
--- /dev/null
+++ b/syweb/webclient/img/close.png
Binary files differdiff --git a/syweb/webclient/img/default-profile.png b/syweb/webclient/img/default-profile.png
new file mode 100644
index 0000000000..6f81a3c417
--- /dev/null
+++ b/syweb/webclient/img/default-profile.png
Binary files differdiff --git a/syweb/webclient/img/gradient.png b/syweb/webclient/img/gradient.png
new file mode 100644
index 0000000000..8ac9e2193f
--- /dev/null
+++ b/syweb/webclient/img/gradient.png
Binary files differdiff --git a/syweb/webclient/img/green_phone.png b/syweb/webclient/img/green_phone.png
new file mode 100644
index 0000000000..28807c749b
--- /dev/null
+++ b/syweb/webclient/img/green_phone.png
Binary files differdiff --git a/syweb/webclient/img/logo-small.png b/syweb/webclient/img/logo-small.png
new file mode 100644
index 0000000000..411206dcdc
--- /dev/null
+++ b/syweb/webclient/img/logo-small.png
Binary files differdiff --git a/syweb/webclient/img/logo.png b/syweb/webclient/img/logo.png
new file mode 100644
index 0000000000..c4b53a8487
--- /dev/null
+++ b/syweb/webclient/img/logo.png
Binary files differdiff --git a/syweb/webclient/img/settings.png b/syweb/webclient/img/settings.png
new file mode 100644
index 0000000000..ac99fe402b
--- /dev/null
+++ b/syweb/webclient/img/settings.png
Binary files differdiff --git a/syweb/webclient/img/video.png b/syweb/webclient/img/video.png
new file mode 100644
index 0000000000..e90afea0c1
--- /dev/null
+++ b/syweb/webclient/img/video.png
Binary files differdiff --git a/syweb/webclient/img/voice.png b/syweb/webclient/img/voice.png
new file mode 100644
index 0000000000..fe464999c0
--- /dev/null
+++ b/syweb/webclient/img/voice.png
Binary files differ