diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-09-07 15:11:36 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-09-07 15:11:36 +0100 |
commit | d23bc77e2c0720e8e79dfa1a8c7289838c9b9794 (patch) | |
tree | b34392b4af082553f84584dda022d57f3c35aa9f /static/client | |
parent | Merge branch 'master' into develop (diff) | |
parent | Merge pull request #269 from matrix-org/markjh/upgrading_setuptools (diff) | |
download | synapse-d23bc77e2c0720e8e79dfa1a8c7289838c9b9794.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'static/client')
0 files changed, 0 insertions, 0 deletions