Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

45bac680

Commit 45bac680 authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

Merge pull request #169 from matrix-org/erikj/ultrajson

Use ultrajson when possible. Add option to turn off freezing of events.

parents afbd3b2f 8355b4d0

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

synapse/app/homeserver.py 4 additions, 0 deletions

synapse/app/homeserver.py
synapse/config/server.py 1 addition, 0 deletions

synapse/config/server.py
synapse/events/__init__.py 10 additions, 1 deletion

synapse/events/__init__.py
synapse/http/server.py 13 additions, 4 deletions

synapse/http/server.py
synapse/python_dependencies.py 4 additions, 3 deletions

synapse/python_dependencies.py
synapse/rest/client/v1/__init__.py 1 addition, 1 deletion

synapse/rest/client/v1/__init__.py
synapse/rest/client/v2_alpha/__init__.py 1 addition, 1 deletion

synapse/rest/client/v2_alpha/__init__.py
synapse/storage/events.py 13 additions, 10 deletions

synapse/storage/events.py

with 47 additions and 20 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