diff options
| author | Erik Johnston <erik@matrix.org> | 2017-11-15 11:35:34 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-11-15 11:35:34 +0000 |
| commit | aa812feb418182aa5ebca76e428ce0bb5ecd9841 (patch) | |
| tree | a92abd0c867b6d5ff5f16ebcc67a01d93a685553 | |
| parent | Merge pull request #2675 from matrix-org/rav/remove_broken_logcontext_funcs (diff) | |
| parent | Merge branch 'release-v0.25.0' of github.com:matrix-org/synapse (diff) | |
| download | synapse-aa812feb418182aa5ebca76e428ce0bb5ecd9841.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.rst | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst |