Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

1d349fb1

Commit 1d349fb1 authored 5 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'erikj/fixup_devices_last_seen_query' of github.com:matrix-org/synapse into develop

parents 16cb9a71 129343cd

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 2 additions, 2 deletions

CHANGES.md
changelog.d/6117.misc 1 addition, 0 deletions

changelog.d/6117.misc
changelog.d/6135.bugfix 1 addition, 0 deletions

changelog.d/6135.bugfix
docs/sample_config.yaml 1 addition, 1 deletion

docs/sample_config.yaml
synapse/config/server.py 1 addition, 1 deletion

synapse/config/server.py
synapse/storage/client_ips.py 39 additions, 7 deletions

synapse/storage/client_ips.py
synapse/storage/engines/postgres.py 7 additions, 0 deletions

synapse/storage/engines/postgres.py
synapse/storage/engines/sqlite.py 8 additions, 0 deletions

synapse/storage/engines/sqlite.py

with 60 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment