Add config option to turn off freezing events. Use new encode_json api and ujson.loads

2015-05-29 12:17:33 +01:00
parent afbd3b2fc4
commit a7b65bdedf
8 changed files with 44 additions and 17 deletions
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -30,6 +30,7 @@ REQUIREMENTS = {
    "frozendict>=0.4": ["frozendict"],
    "pillow": ["PIL"],
    "pydenticon": ["pydenticon"],
+    "ujson": ["ujson"],
 }
 CONDITIONAL_REQUIREMENTS = {
    "web_client": {