summary refs log tree commit diff
path: root/synapse/util/jsonobject.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-04-21 16:39:04 +0100
committerMark Haines <mjark@negativecurvature.net>2016-04-21 16:39:04 +0100
commitb15266fe06d3bfe7b40f55c128bd4ae250ee087b (patch)
tree84feb0ec411b40ac5844c4f144d163732c6f6914 /synapse/util/jsonobject.py
parentpip install new python dependencies in jenkins.sh (diff)
parentMerge branch 'develop' into markjh/slave_event_push_actions (diff)
downloadsynapse-b15266fe06d3bfe7b40f55c128bd4ae250ee087b.tar.xz
Merge pull request #742 from matrix-org/markjh/slave_event_push_actions
Replicate push actions
Diffstat (limited to 'synapse/util/jsonobject.py')
0 files changed, 0 insertions, 0 deletions