diff options
| author | Erik Johnston <erik@matrix.org> | 2016-08-08 11:24:53 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-08-08 11:24:53 +0100 |
| commit | 34101427417f58418a9587adfeca3d41898b5e24 (patch) | |
| tree | f1cb2f39d3838b1dcf709c3f3921dbe82afdd3a5 /CHANGES.rst | |
| parent | Update changelog (diff) | |
| parent | Merge pull request #992 from matrix-org/erikj/psutil_conditional (diff) | |
| download | synapse-34101427417f58418a9587adfeca3d41898b5e24.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'CHANGES.rst')
0 files changed, 0 insertions, 0 deletions