diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-10-02 11:03:13 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-10-02 11:03:13 +0100 |
commit | 2d55d43d40469b0613b761ededabf964717afb9a (patch) | |
tree | b8ffc496ec87a9a0908a3fcc6b0aafcf2cac1e4a /synapse/rest/directory.py | |
parent | Merge remote-tracking branch 'origin/master' into develop (diff) | |
parent | Trivial formatting fixes for README. (diff) | |
download | synapse-2d55d43d40469b0613b761ededabf964717afb9a.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/rest/directory.py')
0 files changed, 0 insertions, 0 deletions