diff options
| author | Erik Johnston <erik@matrix.org> | 2014-12-02 10:29:34 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-12-02 10:29:34 +0000 |
| commit | 740e95ee08e578fadd3e74c1289863a7d1dbabd9 (patch) | |
| tree | a5a19a371bfdd3e96afe8e1ff6c30908195a4d7c /contrib/jitsimeetbridge | |
| parent | re-add OSX troubleshooting instructions (not sure how they got lost) (diff) | |
| parent | Merge pull request #21 from tjardick/master (diff) | |
| download | synapse-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