summary refs log tree commit diff
path: root/synapse/__init__.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-26 16:35:55 +0100
committerErik Johnston <erik@matrix.org>2018-03-26 16:35:55 +0100
commitbdbb1eec6566d19f24505bb64287026bef88ad40 (patch)
treed65eb9f71c0331c07392203fed76f02496f4a845 /synapse/__init__.py
parentFix date (diff)
parentExplicitly use simplejson (diff)
downloadsynapse-bdbb1eec6566d19f24505bb64287026bef88ad40.tar.xz
Merge branch 'erikj/simplejson_replication' of github.com:matrix-org/synapse into release-v0.27.0
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions