diff options
author | Erik Johnston <erik@matrix.org> | 2015-05-11 13:34:31 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-05-11 13:34:31 +0100 |
commit | d244fa974177a3d3fe67164e2860b96895a224bd (patch) | |
tree | 3b5065ac1ed1edd2a1cafd2afa426dae25da088e /contrib/jitsimeetbridge | |
parent | SYN-376: Add script for converting server keys from v1 to v2 (diff) | |
parent | Merge pull request #146 from matrix-org/erikj/push_rules_fixes (diff) | |
download | synapse-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