diff options
| author | Neil Johnson <neil@fragile.org.uk> | 2018-05-01 18:53:56 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@fragile.org.uk> | 2018-05-01 18:53:56 +0100 |
| commit | 2414178ed60faecc67180b233f56055b7e2c5b99 (patch) | |
| tree | 464aa4e585784c2bf5b74765813e4ba09193e7b2 /synapse/app | |
| parent | Merge branch 'release-v0.28.1' into develop (diff) | |
| parent | fix conflict in changelog from previous release (diff) | |
| download | synapse-2414178ed60faecc67180b233f56055b7e2c5b99.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/app')
0 files changed, 0 insertions, 0 deletions