summary refs log tree commit diff
path: root/synapse/util
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-02-13 16:18:34 +0000
committerDavid Baker <dave@matrix.org>2015-02-13 16:18:34 +0000
commit64def4f9536ffe54813e6c509226b02db4f1d9e5 (patch)
tree3fb402a072f8576f544f776dd630d2556b0dba82 /synapse/util
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentUpdate pushers by app id and pushkey, not user id and pushkey (diff)
downloadsynapse-64def4f9536ffe54813e6c509226b02db4f1d9e5.tar.xz
Merge branch 'hotfixes-0.7.0e' into develop
Diffstat (limited to 'synapse/util')
0 files changed, 0 insertions, 0 deletions