summary refs log tree commit diff
path: root/synapse/push/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-29 15:55:58 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-29 15:55:58 +0000
commitcf7c54ec93a733ab8d46d60f907e57ca1cec602f (patch)
treeb6e09bc7b23982501cb49bb3817413a29ffd4600 /synapse/push/__init__.py
parentMerge branch 'client_v2_filter' into client_v2_sync (diff)
parentMerge in auth changes from develop (diff)
downloadsynapse-cf7c54ec93a733ab8d46d60f907e57ca1cec602f.tar.xz
Merge branch 'client_v2_filter' into client_v2_sync
Diffstat (limited to 'synapse/push/__init__.py')
0 files changed, 0 insertions, 0 deletions