diff options
| author | Eric Eastwood <erice@element.io> | 2021-11-03 02:10:07 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2021-11-03 02:10:07 -0500 |
| commit | ec35be57e056a795f7ebe393c81ffcb5bccd5872 (patch) | |
| tree | 5a592e56da1016f180e1097bee20f03425b74539 /scripts-dev/generate_sample_config | |
| parent | Fix lints (diff) | |
| parent | Add index to `local_group_updates.stream_id` (#11231) (diff) | |
| download | synapse-ec35be57e056a795f7ebe393c81ffcb5bccd5872.tar.xz | |
Merge branch 'develop' into madlittlemods/return-historical-events-in-order-from-backfill
Conflicts: scripts-dev/complement.sh synapse/handlers/federation_event.py synapse/handlers/message.py synapse/storage/databases/main/event_federation.py
Diffstat (limited to 'scripts-dev/generate_sample_config')
| -rwxr-xr-x | scripts-dev/generate_sample_config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts-dev/generate_sample_config b/scripts-dev/generate_sample_config |