summary refs log tree commit diff
path: root/synapse/rest/client/v1/push_rule.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-21 17:16:10 +0100
committerErik Johnston <erik@matrix.org>2015-05-21 17:16:10 +0100
commit51f5d36f4fcb9b5bd3b1afbf2dcb9d823f2cf84a (patch)
treea44a6260e7b7f5622785d615a46184e19d21d2ca /synapse/rest/client/v1/push_rule.py
parentMerge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse (diff)
parentBump version (diff)
downloadsynapse-51f5d36f4fcb9b5bd3b1afbf2dcb9d823f2cf84a.tar.xz
Merge branch 'hotfixes-v0.9.0-r5' of github.com:matrix-org/synapse
Diffstat (limited to 'synapse/rest/client/v1/push_rule.py')
0 files changed, 0 insertions, 0 deletions