diff options
author | Mark Haines <mjark@negativecurvature.net> | 2016-04-21 15:37:01 +0100 |
---|---|---|
committer | Mark Haines <mjark@negativecurvature.net> | 2016-04-21 15:37:01 +0100 |
commit | a611c968ccf93ddf50bdf003bb496006bcf42321 (patch) | |
tree | e79a8682325f9368a870832a587b46a84ea0cdbd /synapse/config/database.py | |
parent | Replicate push actions (diff) | |
parent | Make jenkins install lxml (diff) | |
download | synapse-a611c968ccf93ddf50bdf003bb496006bcf42321.tar.xz |
Merge branch 'develop' into markjh/slave_event_push_actions
Diffstat (limited to 'synapse/config/database.py')
0 files changed, 0 insertions, 0 deletions