summary refs log tree commit diff
path: root/contrib/jitsimeetbridge
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2014-12-18 15:06:11 +0000
committerDavid Baker <dave@matrix.org>2014-12-18 15:06:11 +0000
commit0a6664493a6277d6b7b78b54e0b2a6da591ad158 (patch)
treea01e93cb31ca94d83dba6a9a381997b88f5b3a25 /contrib/jitsimeetbridge
parentThank you, pyflakes (diff)
parentMerge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse (diff)
downloadsynapse-0a6664493a6277d6b7b78b54e0b2a6da591ad158.tar.xz
Merge branch 'master' into pushers
Diffstat (limited to 'contrib/jitsimeetbridge')
-rw-r--r--contrib/jitsimeetbridge/unjingle/.swpbin12288 -> 0 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/contrib/jitsimeetbridge/unjingle/.swp b/contrib/jitsimeetbridge/unjingle/.swp
deleted file mode 100644
index 449c08da56..0000000000
--- a/contrib/jitsimeetbridge/unjingle/.swp
+++ /dev/null
Binary files differ