Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

30a8deeb

"README.md" did not exist on "993d90f82ba8faace30cbdaace5a8c5a4468b32a"

Commit 30a8deeb authored 6 years ago by Amber Brown

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into hawkowl/userdir-search

parents 4abc988c b61ac966

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/2090.bugfix 1 addition, 0 deletions

changelog.d/2090.bugfix
changelog.d/4837.bugfix 1 addition, 0 deletions

changelog.d/4837.bugfix
changelog.d/4839.misc 1 addition, 0 deletions

changelog.d/4839.misc
synapse/events/__init__.py 0 additions, 1 deletion

synapse/events/__init__.py
synapse/rest/media/v1/_base.py 51 additions, 3 deletions

synapse/rest/media/v1/_base.py
synapse/storage/events.py 0 additions, 15 deletions

synapse/storage/events.py
synapse/storage/schema/full_schemas/11/event_edges.sql 2 additions, 0 deletions

synapse/storage/schema/full_schemas/11/event_edges.sql
tests/utils.py 1 addition, 0 deletions

tests/utils.py

with 57 additions and 19 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