summary refs log tree commit diff
path: root/contrib/jitsimeetbridge
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-02 10:29:34 +0000
committerErik Johnston <erik@matrix.org>2014-12-02 10:29:34 +0000
commit740e95ee08e578fadd3e74c1289863a7d1dbabd9 (patch)
treea5a19a371bfdd3e96afe8e1ff6c30908195a4d7c /contrib/jitsimeetbridge
parentre-add OSX troubleshooting instructions (not sure how they got lost) (diff)
parentMerge pull request #21 from tjardick/master (diff)
downloadsynapse-740e95ee08e578fadd3e74c1289863a7d1dbabd9.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'contrib/jitsimeetbridge')
0 files changed, 0 insertions, 0 deletions