diff options
| author | Erik Johnston <erik@matrix.org> | 2016-09-05 15:01:33 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-09-05 15:01:33 +0100 |
| commit | 9e6d88f4e2761ee6c2785f33085ba1d396b7e1ed (patch) | |
| tree | 87ea6eaf5acc72908c09f9a249129bc252eae14d /synapse/rest | |
| parent | Take value in a better way (diff) | |
| parent | Merge pull request #1070 from matrix-org/erikj/presence_stats (diff) | |
| download | synapse-9e6d88f4e2761ee6c2785f33085ba1d396b7e1ed.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_storage
Diffstat (limited to 'synapse/rest')
0 files changed, 0 insertions, 0 deletions