diff options
author | Erik Johnston <erikj@jki.re> | 2018-03-28 10:00:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-28 10:00:06 +0100 |
commit | e6d87c93f3794b4b8b1ace3a4f062cb3d6f27008 (patch) | |
tree | d0860263d7bb837c79cbfe68e3660d5651435561 /synapse | |
parent | Merge pull request #3033 from matrix-org/erikj/calculate_state_metrics (diff) | |
parent | Remove last usage of ujson (diff) | |
download | synapse-e6d87c93f3794b4b8b1ace3a4f062cb3d6f27008.tar.xz |
Merge pull request #3030 from matrix-org/erikj/no_ujson
Remove last usage of ujson
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/python_dependencies.py | 1 | ||||
-rw-r--r-- | synapse/storage/group_server.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py |