diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 19:04:58 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 19:04:58 -0400 |
| commit | f5893908429597afbba477449610383f54761940 (patch) | |
| tree | 06e5fc666f0df283be8e1f4013f40cbe77250db0 /changelog.d/6240.misc | |
| parent | Merge branch 'develop' into uhoreg/e2e_backup_hash (diff) | |
| download | synapse-f5893908429597afbba477449610383f54761940.tar.xz | |
fix merge conflict
Diffstat (limited to 'changelog.d/6240.misc')
0 files changed, 0 insertions, 0 deletions