summary refs log tree commit diff
path: root/demo
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-02-05 16:11:34 +0000
committerKegan Dougal <kegan@matrix.org>2015-02-05 16:11:34 +0000
commitc20281ee33b1bd18d78e7fcce0875a268d1369c9 (patch)
treeb701c91c67282600b9db3f5359ac0dd9b4df0edc /demo
parentMerge branch 'develop' into application-services (diff)
parentpriority class now dealt with in namespaced rule_id (diff)
downloadsynapse-c20281ee33b1bd18d78e7fcce0875a268d1369c9.tar.xz
Merge branch 'develop' into application-services
Diffstat (limited to 'demo')
0 files changed, 0 insertions, 0 deletions