diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-05-12 16:37:50 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-05-12 16:37:50 +0100 |
| commit | cffe6057fb59a4db622132a84b5ef88cf81f6bfd (patch) | |
| tree | 173ebcd9a8c7c04ee3a4f733995a47c515e9c81a /synapse/api | |
| parent | Merge branch 'notifier_unify' into notifier_performance (diff) | |
| parent | Merge branch 'develop' into notifier_unify (diff) | |
| download | synapse-cffe6057fb59a4db622132a84b5ef88cf81f6bfd.tar.xz | |
Merge branch 'notifier_unify' into notifier_performance
Conflicts: synapse/notifier.py
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions