diff options
author | Erik Johnston <erik@matrix.org> | 2016-11-22 10:25:23 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-11-22 10:25:23 +0000 |
commit | f9834a3d1a25d0a715718a53e10752399985e3aa (patch) | |
tree | 3d868eafb43d9646b15cd1aaee0f4093db802fd3 /contrib/jitsimeetbridge | |
parent | Merge branch 'erikj/ldap3_auth' (diff) | |
parent | Bump changelog (diff) | |
download | synapse-f9834a3d1a25d0a715718a53e10752399985e3aa.tar.xz |
Merge branch 'release-v0.18.4' of github.com:matrix-org/synapse v0.18.4
Diffstat (limited to 'contrib/jitsimeetbridge')
0 files changed, 0 insertions, 0 deletions