summary refs log tree commit diff
path: root/contrib/jitsimeetbridge
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-11 13:34:31 +0100
committerErik Johnston <erik@matrix.org>2015-05-11 13:34:31 +0100
commitd244fa974177a3d3fe67164e2860b96895a224bd (patch)
tree3b5065ac1ed1edd2a1cafd2afa426dae25da088e /contrib/jitsimeetbridge
parentSYN-376: Add script for converting server keys from v1 to v2 (diff)
parentMerge pull request #146 from matrix-org/erikj/push_rules_fixes (diff)
downloadsynapse-d244fa974177a3d3fe67164e2860b96895a224bd.tar.xz
Merge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'contrib/jitsimeetbridge')
0 files changed, 0 insertions, 0 deletions